diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index e7dbd34e4..b9caad5ab 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -37,7 +37,7 @@ ul_libmount_srcdir = $(top_srcdir)/shlibs/mount/src
 ul_libmount_builddir = $(top_builddir)/shlibs/mount/src
 ul_libmount_la = $(top_builddir)/shlibs/mount/src/libmount.la
 
-# mount.h is generated by ./configure script and stored in build directory
+# libmount.h is generated by ./configure script and stored in build directory
 ul_libmount_incdir = $(ul_libmount_builddir)
 
 $(ul_libmount_la):
diff --git a/configure.ac b/configure.ac
index 3c241e913..246afd4fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1207,7 +1207,7 @@ shlibs/blkid/samples/Makefile
 shlibs/mount/mount.pc
 shlibs/mount/Makefile
 shlibs/mount/src/Makefile
-shlibs/mount/src/mount.h
+shlibs/mount/src/libmount.h
 shlibs/mount/docs/Makefile
 shlibs/mount/docs/version.xml
 shlibs/mount/samples/Makefile
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index af5d6e04b..edf14ebe2 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -32,7 +32,7 @@
 #include <assert.h>
 
 #define USE_UNSTABLE_LIBMOUNT_API
-#include <mount.h>
+#include <libmount.h>
 
 #include "pathnames.h"
 #include "nls.h"
diff --git a/mount/fstab.c b/mount/fstab.c
index 2d3767abd..f812e120c 100644
--- a/mount/fstab.c
+++ b/mount/fstab.c
@@ -151,7 +151,7 @@ read_mntentchn(mntFILE *mfp, const char *fnam, struct mntentchn *mc0) {
 #ifdef HAVE_LIBMOUNT_MOUNT
 
 #define USE_UNSTABLE_LIBMOUNT_API
-#include <mount.h>			/* libmount */
+#include <libmount.h>			/* libmount */
 
 static void read_mounttable()
 {
diff --git a/mount/fstab.h b/mount/fstab.h
index f8ec4ef28..09e995c17 100644
--- a/mount/fstab.h
+++ b/mount/fstab.h
@@ -5,7 +5,7 @@
 
 #ifdef HAVE_LIBMOUNT_MOUNT
 #define USE_UNSTABLE_LIBMOUNT_API
-#include <mount.h>			/* libmount */
+#include <libmount.h>
 extern mnt_lock *init_libmount_lock(const char *filename);
 #endif
 
diff --git a/shlibs/mount/.gitignore b/shlibs/mount/.gitignore
index 1c7879deb..7d203f5f9 100644
--- a/shlibs/mount/.gitignore
+++ b/shlibs/mount/.gitignore
@@ -1,2 +1,2 @@
 test_*
-mount.h
+libmount.h
diff --git a/shlibs/mount/docs/Makefile.am b/shlibs/mount/docs/Makefile.am
index 13e1c655f..3e087d294 100644
--- a/shlibs/mount/docs/Makefile.am
+++ b/shlibs/mount/docs/Makefile.am
@@ -50,7 +50,7 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(ul_libmount_incdir)/mount.h
+HFILE_GLOB=$(ul_libmount_incdir)/libmount.h
 CFILE_GLOB=$(ul_libmount_srcdir)/*.c
 
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
diff --git a/shlibs/mount/mount.pc.in b/shlibs/mount/mount.pc.in
index 94051b8b6..2c327978b 100644
--- a/shlibs/mount/mount.pc.in
+++ b/shlibs/mount/mount.pc.in
@@ -7,5 +7,5 @@ Name: mount
 Description: mount library
 Version: @LIBMOUNT_VERSION@
 Requires.private: blkid
-Cflags: -I${includedir}/mount
+Cflags: -I${includedir}/libmount
 Libs: -L${libdir} -lmount
diff --git a/shlibs/mount/samples/mount.c b/shlibs/mount/samples/mount.c
index eca02d62e..aa7130013 100644
--- a/shlibs/mount/samples/mount.c
+++ b/shlibs/mount/samples/mount.c
@@ -28,7 +28,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "mount.h"
+#include <libmount.h>
+
 #include "nls.h"
 #include "c.h"
 
diff --git a/shlibs/mount/src/Makefile.am b/shlibs/mount/src/Makefile.am
index f552ebee9..ceea6ab58 100644
--- a/shlibs/mount/src/Makefile.am
+++ b/shlibs/mount/src/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS += -I$(ul_libmount_incdir) \
 	       -I$(ul_libblkid_incdir)
 
 # includes
-mountincdir = $(includedir)/mount
-nodist_mountinc_HEADERS = mount.h
+mountincdir = $(includedir)/libmount
+nodist_mountinc_HEADERS = libmount.h
 
 usrlib_exec_LTLIBRARIES = libmount.la
 libmount_la_SOURCES =	mountP.h version.c utils.c test.c init.c cache.c \
@@ -25,7 +25,7 @@ nodist_libmount_la_SOURCES = mountP.h
 
 libmount_la_LIBADD = $(ul_libblkid_la) $(SELINUX_LIBS)
 
-libmount_la_DEPENDENCIES = $(libmount_la_LIBADD) mount.sym mount.h.in
+libmount_la_DEPENDENCIES = $(libmount_la_LIBADD) mount.sym libmount.h.in
 
 libmount_la_LDFLAGS = -Wl,--version-script=$(ul_libmount_srcdir)/mount.sym \
                       -version-info $(LIBMOUNT_VERSION_INFO)
@@ -36,7 +36,7 @@ if HAVE_SELINUX
 TESTS_LIBS += $(SELINUX_LIBS)
 endif
 
-EXTRA_DIST = mount.sym mount.h.in
+EXTRA_DIST = mount.sym libmount.h.in
 CLEANFILES = $(tests)
 
 # move lib from $(usrlib_execdir) to $(libdir) if needed
diff --git a/shlibs/mount/src/mount.h.in b/shlibs/mount/src/libmount.h.in
similarity index 100%
rename from shlibs/mount/src/mount.h.in
rename to shlibs/mount/src/libmount.h.in
diff --git a/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h
index cb7b68cd3..f6c2e2117 100644
--- a/shlibs/mount/src/mountP.h
+++ b/shlibs/mount/src/mountP.h
@@ -16,7 +16,7 @@
 
 #define USE_UNSTABLE_LIBMOUNT_API
 
-#include "mount.h"
+#include "libmount.h"
 #include "list.h"
 
 /* features */