diff --git a/WHATS_NEW b/WHATS_NEW
index 3dc738474..5f8846b71 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.131 - 
 =====================================
+  Fix usage of configure.h when building in srcdir != builddir.
 
 Version 2.02.130 - 5th September 2015
 =====================================
diff --git a/conf/.gitignore b/conf/.gitignore
index f505a4950..4bfc4d334 100644
--- a/conf/.gitignore
+++ b/conf/.gitignore
@@ -2,3 +2,5 @@ command_profile_template.profile
 example.conf
 lvmlocal.conf
 metadata_profile_template.profile
+configure.h
+lvm-version.h
diff --git a/conf/Makefile.in b/conf/Makefile.in
index 128395e3f..b3ea85ba7 100644
--- a/conf/Makefile.in
+++ b/conf/Makefile.in
@@ -54,4 +54,5 @@ install_lvm2: install_conf install_localconf install_profiles
 
 install: install_lvm2
 
-DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES)
+DISTCLEAN_TARGETS += $(CONFSRC) $(CONFLOCAL) $(PROFILE_TEMPLATES) \
+	configure.h lvm-version.h
diff --git a/lib/misc/configure.h.in b/conf/configure.h.in
similarity index 99%
rename from lib/misc/configure.h.in
rename to conf/configure.h.in
index a21d80795..7d157a9a2 100644
--- a/lib/misc/configure.h.in
+++ b/conf/configure.h.in
@@ -1,4 +1,4 @@
-/* lib/misc/configure.h.in.  Generated from configure.in by autoheader.  */
+/* conf/configure.h.in.  Generated from configure.in by autoheader.  */
 
 /* Define to 1 to use libblkid detection of signatures when wiping. */
 #undef BLKID_WIPING_SUPPORT
diff --git a/lib/misc/lvm-version.h.in b/conf/lvm-version.h.in
similarity index 100%
rename from lib/misc/lvm-version.h.in
rename to conf/lvm-version.h.in
diff --git a/configure.in b/configure.in
index 868b3733f..3b58527ec 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ AC_PREREQ(2.61)
 dnl -- Process this file with autoconf to produce a configure script.
 AC_INIT
 AC_CONFIG_SRCDIR([lib/device/dev-cache.h])
-AC_CONFIG_HEADERS([lib/misc/configure.h])
+AC_CONFIG_HEADERS([conf/configure.h])
 
 ################################################################################
 dnl -- Setup the directory where autoconf has auxilary files
@@ -2077,7 +2077,7 @@ lib/format_pool/Makefile
 lib/locking/Makefile
 lib/mirror/Makefile
 lib/replicator/Makefile
-lib/misc/lvm-version.h
+conf/lvm-version.h
 lib/raid/Makefile
 lib/snapshot/Makefile
 lib/thin/Makefile
diff --git a/include/.symlinks.in b/include/.symlinks.in
index e78072a1d..77f23bcb5 100644
--- a/include/.symlinks.in
+++ b/include/.symlinks.in
@@ -1,3 +1,5 @@
+@top_builddir@/conf/configure.h
+@top_builddir@/conf/lvm-version.h
 @top_srcdir@/daemons/clvmd/clvm.h
 @top_srcdir@/daemons/dmeventd/libdevmapper-event.h
 @top_srcdir@/daemons/lvmetad/lvmetad-client.h
@@ -45,7 +47,6 @@
 @top_srcdir@/lib/metadata/vg.h
 @top_srcdir@/lib/mm/memlock.h
 @top_srcdir@/lib/mm/xlate.h
-@top_builddir@/lib/misc/configure.h
 @top_srcdir@/lib/misc/crc.h
 @top_srcdir@/lib/misc/intl.h
 @top_srcdir@/lib/misc/last-path-component.h
@@ -56,7 +57,6 @@
 @top_srcdir@/lib/misc/lvm-globals.h
 @top_srcdir@/lib/misc/lvm-signal.h
 @top_srcdir@/lib/misc/lvm-string.h
-@top_builddir@/lib/misc/lvm-version.h
 @top_srcdir@/lib/misc/lvm-percent.h
 @top_srcdir@/lib/misc/lvm-wrappers.h
 @top_srcdir@/lib/misc/sharedlib.h
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e29ff2985..ec80c7c19 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -229,5 +229,3 @@ include $(top_builddir)/make.tmpl
 CFLAGS += $(BLKID_CFLAGS) $(UDEV_CFLAGS) $(VALGRIND_CFLAGS)
 
 $(SUBDIRS): $(LIB_STATIC)
-
-DISTCLEAN_TARGETS += misc/configure.h misc/lvm-version.h
diff --git a/lib/misc/.gitignore b/lib/misc/.gitignore
deleted file mode 100644
index 396884bea..000000000
--- a/lib/misc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-configure.h
-lvm-version.h