diff --git a/Documentation/ChangeLog b/Documentation/ChangeLog
index 67a81bd..ed205d7 100644
--- a/Documentation/ChangeLog
+++ b/Documentation/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-13  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* GNUmakefile.preamble (ADDITIONAL_LIB_DIRS): Improved linking to
+	the ProjectCenter framework when it's not installed yet so that it
+	should work on non-flattened layouts.
+
 2007-09-27 Sergii Stoian <stoyan255@gmail.com>
 
 	* Framework/PCBundleManager.m,
diff --git a/GNUmakefile.preamble b/GNUmakefile.preamble
index fb05622..3c12ba0 100644
--- a/GNUmakefile.preamble
+++ b/GNUmakefile.preamble
@@ -42,8 +42,7 @@ ADDITIONAL_INCLUDE_DIRS += -I./ -I./Headers
 ADDITIONAL_LDFLAGS += 
 
 # Additional library directories the linker should search
-ADDITIONAL_LIB_DIRS += -L./Framework/ProjectCenter.framework/Versions/Current \
-                       -L./Framework/ProjectCenter.framework
+ADDITIONAL_LIB_DIRS += -L./Framework/ProjectCenter.framework/$(GNUSTEP_TARGET_LDIR)
 
 # Additional LDFLAGS to pass to the linker
 ADDITIONAL_GUI_LIBS += -lProjectCenter