diff --git a/configure.in b/configure.ac
similarity index 97%
rename from configure.in
rename to configure.ac
index 0ccc06d..f2ad4f0 100644
--- a/configure.in
+++ b/configure.ac
@@ -1,6 +1,7 @@
 # $Id$
-m4_include(ax_cxx_compile_stdcxx_11.m4)
-m4_include(ax_check_qt.m4)
+AC_CONFIG_MACRO_DIR([m4])
+#m4_include(ax_cxx_compile_stdcxx_11.m4)
+#m4_include(ax_check_qt.m4)
 AC_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR])
 AC_DEFUN([AX_DEFINE_DIR], [
   prefix_NONE=
@@ -74,7 +75,7 @@ AC_SUBST_FILE(README)
 CHANGE_LOG=ChangeLog
 AC_SUBST_FILE(CHANGE_LOG)
 
-AM_CPPFLAGS+="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"'"
+AM_CPPFLAGS+="-DPACKAGEVERSION='\"${VERSION}\"' -DPACKAGENAME='\"${PACKAGENAME}\"'"configure.ac
 
 # Get rid of that stupid -O2 -g options!
 CXXFLAGS="${CXXFLAGS:-}"
diff --git a/ax_check_qt.m4 b/m4/ax_check_qt.m4
similarity index 100%
rename from ax_check_qt.m4
rename to m4/ax_check_qt.m4
diff --git a/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4
similarity index 100%
rename from ax_cxx_compile_stdcxx_11.m4
rename to m4/ax_cxx_compile_stdcxx_11.m4