diff --git a/ChangeLog b/ChangeLog
index 6046282..5334707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-06  Matthew Allum,,,  <mallum@openedhand.com>
+
+	* configure.ac:
+	* matchbox-desktop.pc.in:
+	* src/Makefile.am:
+	Fix matchbox-desktop.pc up
+
 2004-02-06  Matthew Allum,,,  <mallum@openedhand.com>
 
 	* data/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 9533bb3..d9babcd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,6 @@ dnl ------ GCC flags --------------------------------------------------------
 
 if test "x$GCC" = "xyes"; then
         GCC_WARNINGS="-g -Wall -fno-strict-aliasing"
-        LIBMB_CFLAGS="$GCC_WARNINGS $LIBMB_CFLAGS"
 fi
 
 
@@ -98,6 +97,7 @@ dnl ------ Substitute in found libs, clags to Makefiles etc -----------------
 
 AC_SUBST(LIBMB_CFLAGS)
 AC_SUBST(LIBMB_LIBS)
+AC_SUBST(GCC_WARNINGS)
 
 AC_SUBST(SN_CFLAGS)
 AC_SUBST(SN_LIBS)
diff --git a/matchbox-desktop.pc.in b/matchbox-desktop.pc.in
index 9d6267b..e742d08 100644
--- a/matchbox-desktop.pc.in
+++ b/matchbox-desktop.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: matchbox-desktop
 Description: Matchbox Desktop module dependencies.
 Version: @VERSION@
-Libs: -L${libdir} @MB_LIBS@
-Cflags: -I${includedir}/matchbox-desktop @MB_CFLAGS@
\ No newline at end of file
+Libs: -L${libdir} @LIBMB_LIBS@
+Cflags: -I${includedir}/matchbox-desktop @LIBMB_CFLAGS@
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index 7f8c3c0..e44962f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ PREFIXDIR  = $(prefix)
 PKGDATADIR = $(pkgdatadir)
 DATADIR    = $(datadir)
 
-INCLUDES = -DDATADIR=\"$(DATADIR)\" -DPKGDATADIR=\"$(PKGDATADIR)\" -DPREFIX=\"$(PREFIXDIR)\" $(LIBMB_CFLAGS)
+INCLUDES = $(GCC_WARNINGS) -DDATADIR=\"$(DATADIR)\" -DPKGDATADIR=\"$(PKGDATADIR)\" -DPREFIX=\"$(PREFIXDIR)\" $(LIBMB_CFLAGS) 
 
 bin_PROGRAMS = matchbox-desktop