diff --git a/src/Makefile b/src/Makefile
index 5038ea6e6..30a4a8f6e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,7 @@ include config.mk
 
 
 GHMAKE=$(GHC) --make
-GHCFLAGS=-package lang -package util -fglasgow-exts
+GHCFLAGS=-package lang -package util -fglasgow-exts $(CPPFLAGS) $(LDFLAGS)
 GHCOPTFLAGS=-O $(GHCFLAGS)
 GHCFUDFLAG=-package Fudgets
 
diff --git a/src/config.mk.in b/src/config.mk.in
index cd55a46c8..c9d904087 100644
--- a/src/config.mk.in
+++ b/src/config.mk.in
@@ -8,6 +8,9 @@ exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
 
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+
 INSTALL = @INSTALL@
 
 GHC = @GHC@
diff --git a/src/configure.ac b/src/configure.ac
index 8a9cb31c2..c36de72ea 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([GF],[2.0],[aarne@cs.chalmers.se],[GF])
 
 AC_PREREQ(2.53)
 
-AC_REVISION($Revision: 1.3 $)
+AC_REVISION($Revision: 1.4 $)
 
 AC_CONFIG_FILES([config.mk jgf])
 
@@ -33,6 +33,13 @@ dnl ***********************************************
 
 AC_PROG_INSTALL
 
+dnl ***********************************************
+dnl Program flags
+dnl ***********************************************
+
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+
 dnl ***********************************************
 dnl Output
 dnl ***********************************************