diff --git a/chrome/content/zotero/preferences.js b/chrome/content/zotero/preferences.js
index 862c4ae89..015ef60e2 100644
--- a/chrome/content/zotero/preferences.js
+++ b/chrome/content/zotero/preferences.js
@@ -24,19 +24,6 @@ var openURLServerField;
 var openURLVersionMenu;
 var zoteroPaneOnTopInitial;
 
-/*
-	To add a new preference:
-		1) modify defaults/preferences/zotero.js
-		2) in this document:
-			a) add var above
-			b) add lines to init() function
-			c) add line to accept() function
-		3) add a control to prefs.xul
-		4) (Optional) To add an observer for a preference change,
-			add an appropriate case in the switch statement
-			in Zotero.Prefs.observe()
-*/
-
 function init()
 {
 	// Display the appropriate modifier keys for the platform
diff --git a/chrome/content/zotero/preferences.xul b/chrome/content/zotero/preferences.xul
index 6d456e4e0..89a1a0cb1 100644
--- a/chrome/content/zotero/preferences.xul
+++ b/chrome/content/zotero/preferences.xul
@@ -26,6 +26,17 @@
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://zotero/skin/preferences.css"?>
 
+<!--
+
+To add a new preference:
+	1) Add a new <preference> to <preferences>
+	2) Add a XUL control with a 'preference' attribute
+	3) (Optional) Add additional setup/change logic to preferences.js
+	4) (Optional) To add an observer for a preference change,
+		add an appropriate case in the switch statement
+		in Zotero.Prefs.observe()
+
+-->
 <prefwindow id="zotero-prefs" title="&zotero.preferences.title;" onload="moveToAlertPosition(); init()"
 		windowtype="zotero:pref" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	
@@ -36,6 +47,7 @@
 			<preference id="pref-reportTranslationFailure" name="extensions.zotero.reportTranslationFailure" type="bool"/>
 			<preference id="pref-parseEndNoteMIMETypes" name="extensions.zotero.parseEndNoteMIMETypes" type="bool" onchange="Zotero.Ingester.MIMEHandler.init()"/>
 			<preference id="pref-automaticSnapshots" name="extensions.zotero.automaticSnapshots" type="bool"/>
+			<preference id="pref-downloadAssociatedFiles" name="extensions.zotero.downloadAssociatedFiles" type="bool"/>
 			<preference id="pref-openURL-resolver" name="extensions.zotero.openURL.resolver" type="string"/>
 			<preference id="pref-openURL-version" name="extensions.zotero.openURL.version" type="string"/>
 		</preferences>
@@ -57,10 +69,9 @@
 		</hbox>
 		
 		<checkbox label="&zotero.preferences.reportTranslationFailure;" preference="pref-reportTranslationFailure"/>
-		
 		<checkbox label="&zotero.preferences.parseEndnote;" preference="pref-parseEndNoteMIMETypes"/>
-		
 		<checkbox label="&zotero.preferences.automaticSnapshots;" preference="pref-automaticSnapshots"/>
+		<checkbox label="&zotero.preferences.downloadAssociatedFiles;" preference="pref-downloadAssociatedFiles"/>
 		
 		<groupbox>
 			<caption label="&zotero.preferences.openurl.caption;"/>
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index d4c6233a0..c6f7e50f9 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -10,6 +10,7 @@
 <!ENTITY zotero.preferences.position.browser				"browser content">
 <!ENTITY zotero.preferences.parseEndnote					"Use Zotero for downloaded EndNote files">
 <!ENTITY zotero.preferences.automaticSnapshots			"Automatically take snapshots when creating items from web pages">
+<!ENTITY zotero.preferences.downloadAssociatedFiles		"Automatically attach associated PDFs and other files when saving items">
 <!ENTITY zotero.preferences.openurl.caption				"OpenURL">
 <!ENTITY zotero.preferences.openurl.custom				"Custom...">
 <!ENTITY zotero.preferences.openurl.server				"Resolver:">