diff --git a/chrome/content/zotero/preferences.xul b/chrome/content/zotero/preferences.xul
index 359110961..e5202fc04 100644
--- a/chrome/content/zotero/preferences.xul
+++ b/chrome/content/zotero/preferences.xul
@@ -49,6 +49,7 @@ To add a new preference:
 			<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-automaticTags" name="extensions.zotero.automaticTags" 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>
@@ -88,6 +89,7 @@ To add a new preference:
 			<checkbox label="&zotero.preferences.parseEndnote;" preference="pref-parseEndNoteMIMETypes"/>
 			<checkbox label="&zotero.preferences.automaticSnapshots;" preference="pref-automaticSnapshots"/>
 			<checkbox label="&zotero.preferences.downloadAssociatedFiles;" preference="pref-downloadAssociatedFiles"/>
+			<checkbox label="&zotero.preferences.automaticTags;" preference="pref-automaticTags"/>
 		</groupbox>
 		
 		<groupbox>
diff --git a/chrome/content/zotero/xpcom/translate.js b/chrome/content/zotero/xpcom/translate.js
index a4e679a3b..c3c99846f 100644
--- a/chrome/content/zotero/xpcom/translate.js
+++ b/chrome/content/zotero/xpcom/translate.js
@@ -1316,7 +1316,10 @@ Zotero.Translate.prototype._itemDone = function(item, attachedTo) {
 		}
 	}
 	
-	if(item.tags) {
+	// handle tags, if this is an import translation or automatic tagging is
+	// enabled in the preferences (as it is by default)
+	if(item.tags &&
+	  (this.type == "import" || Zotero.Prefs.get("automaticTags"))) {
 		for each(var tag in item.tags) {
 			if(typeof(tag) == "string") {
 				// accept strings in tag array as automatic tags, or, if
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 8d8d5ef8a..720fc6e4e 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -13,6 +13,7 @@
 <!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.automaticTags				"Automatically tag items with keywords and subject headings">
 <!ENTITY zotero.preferences.openurl.caption				"OpenURL">
 <!ENTITY zotero.preferences.openurl.custom				"Custom...">
 <!ENTITY zotero.preferences.openurl.server				"Resolver:">
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index ddf5442db..99c5f000c 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -14,6 +14,7 @@ pref("extensions.zotero.automaticSnapshots",true);
 pref("extensions.zotero.downloadAssociatedFiles",false);
 pref("extensions.zotero.reportTranslationFailure",true);
 pref("extensions.zotero.enableMacClipboard",false);
+pref("extensions.zotero.automaticTags",true);
 
 pref("extensions.zotero.lastCreatorFieldMode",0);
 pref("extensions.zotero.lastRenameAssociatedFile", false);