diff --git a/chrome/content/zotero/publicationsDialog.js b/chrome/content/zotero/publicationsDialog.js
index 5e8540867d..e8c0ef1a43 100644
--- a/chrome/content/zotero/publicationsDialog.js
+++ b/chrome/content/zotero/publicationsDialog.js
@@ -67,6 +67,7 @@ var Zotero_Publications_Dialog = new function () {
 	this.updatePage = function () {
 		if (!_initialized) {
 			_init();
+			this.updateInclude();
 		}
 		
 		var wizard = document.getElementById('zotero-publications-wizard');
@@ -138,12 +139,14 @@ var Zotero_Publications_Dialog = new function () {
 			return;
 		}
 		
-		if (currentPage.pageid == 'intro' ||
+		if (_hasFiles
+				&& _includeFiles
+				&& (currentPage.pageid == 'intro' ||
 				// If CC selected on sharing page and we're not using existing rights for all
 				// items, go to license chooser next
 				(currentPage.pageid == 'choose-sharing'
 					&& _shareSettings.sharing == 'cc'
-					&& !(_hasRights == 'all' && _keepRights))) {
+					&& !(_hasRights == 'all' && _keepRights)))) {
 			this.lastPage = false;
 			nextButton.label = Zotero.getString(
 				'publications.buttons.next',
@@ -167,8 +170,13 @@ var Zotero_Publications_Dialog = new function () {
 	this.updateInclude = function () {
 		var filesCheckbox = document.getElementById('include-files');
 		var notesCheckbox = document.getElementById('include-notes')
+		var authorshipCheckbox = document.getElementById('confirm-authorship-checkbox');
 		_includeFiles = filesCheckbox.checked;
 		_includeNotes = notesCheckbox.checked;
+		authorshipCheckbox.label = Zotero.getString(
+			'publications.intro.authorship' + (_includeFiles ? '.files' : '')
+		);
+		this.updateNextButton();
 	}
 	
 	
diff --git a/chrome/content/zotero/publicationsDialog.xul b/chrome/content/zotero/publicationsDialog.xul
index 762f921c00..ff02c56d0a 100644
--- a/chrome/content/zotero/publicationsDialog.xul
+++ b/chrome/content/zotero/publicationsDialog.xul
@@ -55,7 +55,6 @@
 				oncommand="Zotero_Publications_Dialog.updateInclude()"/>
 		<separator/>
 		<checkbox id="confirm-authorship-checkbox"
-				label="&zotero.publications.authorship.checkbox;"
 				oncommand="Zotero_Publications_Dialog.updateNextButton()"/>
 	</wizardpage>
 	
diff --git a/chrome/locale/en-US/zotero/publications.dtd b/chrome/locale/en-US/zotero/publications.dtd
index 3bc7273936..11844e6e68 100644
--- a/chrome/locale/en-US/zotero/publications.dtd
+++ b/chrome/locale/en-US/zotero/publications.dtd
@@ -1,9 +1,8 @@
 <!ENTITY zotero.publications.my_publications "My Publications">
 
-<!ENTITY zotero.publications.intro "Items you add to My Publications will be shown on your profile page on zotero.org. If you choose to include attached files and notes, they will be made publicly available under the license you specify. Only add work you yourself have created, and only include files and notes if you have the rights to distribute them and wish to do so.">
+<!ENTITY zotero.publications.intro "Items you add to My Publications will be shown on your profile page on zotero.org. If you choose to include attached files, they will be made publicly available under the license you specify. Only add work you yourself have created, and only include files if you have the rights to distribute them and wish to do so.">
 <!ENTITY zotero.publications.include.checkbox.files "Include files">
 <!ENTITY zotero.publications.include.checkbox.notes "Include notes">
-<!ENTITY zotero.publications.authorship.checkbox "I created this work and have the rights to distribute included files and notes.">
 
 <!ENTITY zotero.publications.sharing.title "Choose how your work may be shared">
 <!ENTITY zotero.publications.sharing.text "You can reserve all rights to your work, license it under a Creative Commons license, or dedicate it to the public domain. In all cases, the work will be made publicly available via zotero.org.">
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 8c16cbc99a..d8308c868c 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -1052,7 +1052,8 @@ styles.preview.instructions		= Select one or more items in Zotero and click the
 publications.intro.text1 = My Publications allows you to create a list of your own work and share it on your profile page on %S. You can add notes about each item and even share PDFs or other files under a license you specify.
 publications.intro.text2 = To add items, drag them from another library. You’ll be able to choose whether to include attached notes and files.
 publications.intro.text3 = <b>Only add work you yourself have created</b>, and only include files if you have the rights to distribute them publicly and wish to do so.
-
+publications.intro.authorship = I created this work.
+publications.intro.authorship.files = I created this work and have the rights to distribute included files.
 publications.sharing.keepRightsField = Keep the existing Rights field
 publications.sharing.keepRightsFieldWhereAvailable = Keep the existing Rights field where available
 publications.cc.moreInfo.text = Be sure you have read the Creative Commons %S before placing your work under a CC license. Note that the license you apply cannot be revoked, even if you later choose different terms or cease publishing the work.
diff --git a/chrome/skin/default/zotero/publicationsDialog.css b/chrome/skin/default/zotero/publicationsDialog.css
index baf93d939a..e30ff69860 100644
--- a/chrome/skin/default/zotero/publicationsDialog.css
+++ b/chrome/skin/default/zotero/publicationsDialog.css
@@ -14,3 +14,7 @@ a {
 	color: -moz-nativehyperlinktext;
 	text-decoration: underline;
 }
+
+#confirm-authorship-checkbox {
+	-moz-box-align: baseline;
+}