diff --git a/ChangeLog b/ChangeLog
index 4e16243..d801ad0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2018-08-19 Riccardo Mottola <rm@gnu.org>
+
+	* Modules/Projects/Framework/PCFrameworkProject.h
+	* Modules/Projects/Framework/PCFrameworkProject.m
+	Add some GSDoc makefile aids
+
 2017-08-16 Riccardo Mottola <rm@gnu.org>
 
 	* Modules/Projects/Application/PCAppProject.m
-	Fix for nill bundle identifier.
+	Fix for nil bundle identifier.
 
 2017-01-17 Riccardo Mottola <rm@gnu.org>
 
diff --git a/Modules/Projects/Framework/PCFrameworkProject.h b/Modules/Projects/Framework/PCFrameworkProject.h
index d1f0f8f..1b6daa7 100644
--- a/Modules/Projects/Framework/PCFrameworkProject.h
+++ b/Modules/Projects/Framework/PCFrameworkProject.h
@@ -1,7 +1,7 @@
 /*
    GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
 
-   Copyright (C) 2004-2017 Free Software Foundation
+   Copyright (C) 2004-2018 Free Software Foundation
 
    Authors: Serg Stoyan
             Riccardo Mottola
@@ -60,6 +60,7 @@
 - (BOOL)writeMakefile;
 - (void)appendHead:(PCMakefileFactory *)mff;
 - (void)appendPublicHeaders:(PCMakefileFactory *)mff;
+- (void)appendGSDoc:(PCMakefileFactory *)mff;
 - (void)appendTail:(PCMakefileFactory *)mff;
 
 @end
diff --git a/Modules/Projects/Framework/PCFrameworkProject.m b/Modules/Projects/Framework/PCFrameworkProject.m
index 4237c82..e3ef456 100644
--- a/Modules/Projects/Framework/PCFrameworkProject.m
+++ b/Modules/Projects/Framework/PCFrameworkProject.m
@@ -1,7 +1,7 @@
 /*
    GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
 
-   Copyright (C) 2005-2017 Free Software Foundation
+   Copyright (C) 2005-2018 Free Software Foundation
 
    Authors: Serg Stoyan
             Riccardo Mottola
@@ -253,6 +253,9 @@
   [mf appendClasses:[projectDict objectForKey:PCClasses]];
   [mf appendOtherSources:[projectDict objectForKey:PCOtherSources]];
 
+  // AutoGSDoc
+  [self appendGSDoc:mf];
+  
   // Tail
   [self appendTail:mf];
 
@@ -311,6 +314,20 @@
     }
 }
 
+- (void)appendGSDoc:(PCMakefileFactory *)mff
+{
+  [mff appendString:@"\n#\n# AutoGSDoc\n#\n"];
+  [mff appendString: [NSString stringWithFormat:@"DOCUMENT_NAME = %@\n\n", projectName]];
+  [mff appendString: [NSString stringWithFormat:@"%@_AGSDOC_FILES = %@.gsdoc \\\n", 
+                              projectName, projectName]];
+  [mff appendString: [NSString stringWithFormat:@"\t$(%@_HEADER_FILES) \\\n", 
+                              projectName, projectName]];
+  [mff appendString: [NSString stringWithFormat:@"\t$(%@_OBJC_FILES) \\\n", 
+                              projectName, projectName]];
+  [mff appendString: [NSString stringWithFormat:@"\n\n%@_AGSDOC_FLAGS += -MakeFrames YES\n", projectName]];
+}
+
+
 - (void)appendTail:(PCMakefileFactory *)mff
 {
   [mff appendString:@"\n\n#\n# Makefiles\n#\n"];
@@ -318,6 +335,11 @@
   [mff appendString:@"include $(GNUSTEP_MAKEFILES)/aggregate.make\n"];
   [mff appendString:@"include $(GNUSTEP_MAKEFILES)/framework.make\n"];
   [mff appendString:@"-include GNUmakefile.postamble\n"];
+
+  [mff appendString:@"\n\n#Only build documentation if doc=yes was passed on the command line\n#\n"];
+  [mff appendString:@"ifeq ($(doc),yes)\n"];
+  [mff appendString:@"include $(GNUSTEP_MAKEFILES)/documentation.make\n"];
+  [mff appendString:@"endif\n"];
 }
 
 @end