--- new/installer/src/GLIArchitectureTemplate.py	2005-04-17 06:57:11.000000000 +0100
+++ scripts/GLIArchitectureTemplate.py	2005-04-19 11:35:49.000000000 +0100
@@ -163,14 +163,14 @@
 					if not file[i][0] == '#':
 						file[i] = '#' + file[i]
 	
-			file.append('\n# Added by GLI\n')
-			commentprefix = ""
-			if newvalues[key] == "COMMENT" or newvalues[key] == "##comment##":
-				commentprefix = "#"
-			if quotes_around_value:
-				file.append(commentprefix + key + delimeter + '"' + newvalues[key] + '"\n')
+			if key == "SPACER":
+				file.append('\n')
+			elif key == "COMMENT" or key == "##comment##":
+				file.append('# ' + newvalues[key] + '\n')
+			elif quotes_around_value:
+				file.append(key + delimeter + '"' + newvalues[key] + '"\n')
 			else:
-				file.append(commentprefix + key + delimeter + newvalues[key]+'\n')
+				file.append(key + delimeter + newvalues[key]+'\n')
 	
 		f = open(filename,'w')
 		f.writelines(file)
@@ -349,7 +349,11 @@
 	def configure_make_conf(self):
 		# Get make.conf options
 		options = self._install_profile.get_make_conf()
-		
+
+		if options.keys():
+			self._edit_config(self._chroot_dir + "/etc/make.conf", {"SPACER": ""})
+			self._edit_config(self._chroot_dir + "/etc/make.conf", {"COMMENT": "GLI additions ===>"})
+
 		# For each configuration option...
 		for key in options.keys():
 		
@@ -357,6 +361,9 @@
 			self._edit_config(self._chroot_dir + "/etc/make.conf", {key: options[key]})
 		self._logger.log("Make.conf configured")
 
+		if options.keys():
+			self._edit_config(self._chroot_dir + "/etc/make.conf", {"COMMENT": "<=== End GLI additions"})
+
 	##
 	# This will get/update the portage tree.  If you want to snapshot or mount /usr/portage use "custom".
 	def install_portage_tree(self):