diff --git a/configure b/configure
index 81ccfb08152..0808696ce5d 100755
--- a/configure
+++ b/configure
@@ -843,3 +843,21 @@ OBJS += $OBJS
 DEFINES += $DEFINES
 LDFLAGS += $LDFLAGS
 EOF
+
+#
+# Create a custom Makefile when building outside the source tree
+# TODO: Add a better check than just looking for 'Makefile'
+#
+if test ! -f Makefile ; then
+_srcdir=`dirname $0`
+echo "Creating Makefile"
+
+cat > Makefile << EOF
+# -------- Generated by configure -----------
+srcdir = $_srcdir
+vpath %.cpp \$(srcdir)
+vpath %.h \$(srcdir)
+include \$(srcdir)/Makefile
+EOF
+
+fi