diff --git a/development/qmake/qt4/qt4.pro b/development/qmake/qt4/qt4.pro
index 8766ca7164..f90bea2a0e 100644
--- a/development/qmake/qt4/qt4.pro
+++ b/development/qmake/qt4/qt4.pro
@@ -88,7 +88,6 @@ HPP += PanelStack.h
 HPP += pch.h
 HPP += qlkey.h
 HPP += qt_helpers.h
-HPP += SocketCallback.h
 HPP += TocModel.h
 HPP += TocWidget.h
 HPP += Validator.h
@@ -168,7 +167,6 @@ CPP += LengthCombo.cpp
 CPP += LyXFileDialog.cpp
 CPP += PanelStack.cpp
 CPP += qt_helpers.cpp
-CPP += SocketCallback.cpp
 CPP += TocModel.cpp
 CPP += TocWidget.cpp
 CPP += Validator.cpp
diff --git a/development/qmake/src/src.pro b/development/qmake/src/src.pro
index 2c44a0a2ff..2a5c65cd68 100644
--- a/development/qmake/src/src.pro
+++ b/development/qmake/src/src.pro
@@ -69,6 +69,7 @@ HPP += Messages.h
 HPP += MetricsInfo.h
 HPP += Mover.h
 HPP += OutputParams.h
+HPP += PDFOptions.h
 HPP += PSpell.h
 HPP += ParIterator.h
 HPP += Paragraph.h
@@ -178,6 +179,7 @@ CPP += Messages.cpp
 CPP += MetricsInfo.cpp
 CPP += Mover.cpp
 CPP += OutputParams.cpp
+CPP += PDFOptions.cpp
 #CPP += PSpell.cpp
 CPP += ParIterator.cpp
 CPP += Paragraph.cpp
diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index 36b5443460..3be332a619 100644
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -92,6 +92,7 @@ src_header_files = Split('''
     ModuleList.h
     Mover.h
     OutputParams.h
+    PDFOptions.h
     PSpell.h
     ParIterator.h
     Paragraph.h
@@ -201,6 +202,7 @@ src_pre_files = Split('''
     MetricsInfo.cpp
     Mover.cpp
     OutputParams.cpp
+    PDFOptions.cpp
     ParIterator.cpp
     Paragraph.cpp
     ParagraphMetrics.cpp
diff --git a/lib/CREDITS b/lib/CREDITS
index 33544f67a4..9c6df57e37 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -240,7 +240,7 @@
    Support for kluwer and ijmpd document classes
 @bSanda Pavel
 @iE-mail: ps@ucw !cz
-   Czech translation
+   Czech translation, pdf support
 @bBo Peng
 @iE-mail: ben.bob@gmail.com
    Conversion of all shell scripts to Python, session, view-source, auto-view features and scons build system.
diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py
index 84f8ba6633..3506b4ff99 100644
--- a/lib/lyx2lyx/lyx_1_6.py
+++ b/lib/lyx2lyx/lyx_1_6.py
@@ -178,6 +178,24 @@ def remove_manifest(document):
     "Remove the manifest section"
     document.manifest = None
 
+##
+#  Discard PDF options for hyperref
+#
+
+def revert_pdf_options(document):
+    "Revert PDF options for hyperref. "
+    i = 0
+    while 1:
+        i = find_tokens(document.header, [ "\\use_hyperref", "\\pdf_title", "\\pdf_author", "\\pdf_subject",
+                                           "\\pdf_keywords", "\\pdf_bookmarks", "\\pdf_bookmarksnumbered",
+                                           "\\pdf_bookmarksopen", "\\pdf_bookmarksopenlevel", "\\pdf_breaklinks",
+                                           "\\pdf_border", "\\pdf_colorlinks", "\\pdf_backref", "\\pdf_pagebackref",
+					   "\\pdf_fullscreen", "\\pdf_quoted_options", "\\pdf_store_options" ], i)
+        if i == -1:
+            return
+        document.body[i] = ""
+        i = i + 1
+
 
 def remove_inzip_options(document):
     "Remove inzipName and embed options from the Graphics inset"