diff --git a/README.md b/README.md
index 00fdfa3..e9ab27c 100644
--- a/README.md
+++ b/README.md
@@ -126,3 +126,4 @@ The `build.py` script that builds the manual accepts the following options:
 - '-q', or '--quiet', to suppress all output (overrides -v)
 - '-d', or '--devmode', to add content to pages to help developers debug them
 (link, file name, URL)
+- '-n', or '--nopdf', to prevent the build script from generate a PDF from the content
diff --git a/build.py b/build.py
index e656fd1..75a13f1 100755
--- a/build.py
+++ b/build.py
@@ -454,11 +454,12 @@ temp.close()
 onepage = onepage.replace('{{page.bootstrap_path}}', global_bootstrap_path)
 onepage = onepage.replace('{{page.page_title}}', global_page_title)
 
-# Same as above, but for the PDF version
-temp = open(global_pdf_template)
-pdfpage = temp.read()
-temp.close()
-pdfpage = pdfpage.replace('{{page.page_title}}', global_page_title)
+if not nopdf:
+	# Same as above, but for the PDF version
+	temp = open(global_pdf_template)
+	pdfpage = temp.read()
+	temp.close()
+	pdfpage = pdfpage.replace('{{page.page_title}}', global_page_title)
 
 # Parse out the master document's structure into a dictionary list
 fileStruct = GetFileStructure()
@@ -614,7 +615,8 @@ for header in fileStruct:
 
 	# Set up the actual page from the template
 	onepage = onepage.replace('{{ content }}', oph + '\n' + opcontent + '\n{{ content }}')
-	pdfpage = pdfpage.replace('{{ content }}', oph + '\n' + opcontent + '\n{{ content }}')
+	if not nopdf:
+		pdfpage = pdfpage.replace('{{ content }}', oph + '\n' + opcontent + '\n{{ content }}')
 
 	# ----- Normal version -----
 
@@ -681,6 +683,8 @@ if not nopdf:
 	pdfpageFile = open(global_site_dir + 'pdf.html', 'w')
 	pdfpage = pdfpage.replace('{% tree %}', opsidebar) # create the TOC
 	pdfpage = pdfpage.replace('{{ content }}', '') # cleans up the last spaceholder
+	pdfpage = pdfpage.replace('src="/images/', 'src="images/') # makes images links relative
+	pdfpage = pdfpage.replace('url(\'/images/', 'url(\'images/') # CSS images links relative
 	pdfpageFile.write(pdfpage)
 	pdfpageFile.close()
 
diff --git a/page-template.html b/page-template.html
index bc4a100..026d0be 100644
--- a/page-template.html
+++ b/page-template.html
@@ -27,7 +27,7 @@
 						<input type="text" class="form-control" placeholder="Search &hellip;" name="q">
 						<span class="input-group-btn">
 							<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search" aria-hidden="true"></span></button>
-							<button class="btn btn-default" type="button" onclick="window.location.href='/ardourmanual.html'"><span class="glyphicon glyphicon-book" aria-hidden="true"></span></button>
+							<button class="btn btn-default" type="button" onclick="window.location.href='/manual.pdf'"><span class="glyphicon glyphicon-book" aria-hidden="true"></span></button>
 						</span>
 					</div>
 					<input type="hidden" name="sites" value="manual.ardour.org"><!-- domain -->