diff -Nru fgrun-3.4.0.final/debian/changelog fgrun-3.4.0.final/debian/changelog
--- fgrun-3.4.0.final/debian/changelog	2015-11-10 19:55:44.000000000 +0100
+++ fgrun-3.4.0.final/debian/changelog	2016-07-11 10:15:03.000000000 +0200
@@ -1,3 +1,12 @@
+fgrun (3.4.0.final-3) unstable; urgency=medium
+
+  * Rebase patches to be Debian friendly and fix build failures
+    Closes: #830421
+  * Bump std-version to 3.9.8, no changes required.
+  * Make VCS fields in secure mode, and fix VCS-GIT
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 11 Jul 2016 10:12:02 +0200
+
 fgrun (3.4.0.final-2) unstable; urgency=medium
 
   * Rebuild with gcc5, against renamed simgear.
diff -Nru fgrun-3.4.0.final/debian/control fgrun-3.4.0.final/debian/control
--- fgrun-3.4.0.final/debian/control	2015-11-10 19:50:23.000000000 +0100
+++ fgrun-3.4.0.final/debian/control	2016-07-11 10:34:03.000000000 +0200
@@ -5,12 +5,12 @@
 Uploaders: Christopher Baines <cbaines8@gmail.com>,
  Markus Wanner <markus@bluegap.ch>
 Build-Depends: debhelper (>= 9), cmake, libfltk1.3-dev, fluid,
- libsimgear-dev (>= 3.4.0~), libboost-dev,
+ libsimgear-dev (>= 3.4.0~), libboost-dev, libexpat-dev,
  zlib1g-dev (>= 1:1.2.3.4.dfsg-3)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://fgrun.sourceforge.net/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/fgrun.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/fgrun.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/fgrun.git
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/fgrun.git
 
 Package: fgrun
 Architecture: any
diff -Nru fgrun-3.4.0.final/debian/patches/find-and-link-libs.patch fgrun-3.4.0.final/debian/patches/find-and-link-libs.patch
--- fgrun-3.4.0.final/debian/patches/find-and-link-libs.patch	1970-01-01 01:00:00.000000000 +0100
+++ fgrun-3.4.0.final/debian/patches/find-and-link-libs.patch	2016-07-11 10:13:22.000000000 +0200
@@ -0,0 +1,42 @@
+Description: Fix build failures by detecting and linking libraries:
+ - OPENGL
+ - Threads
+ - EXPAT
+
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+
+Index: fgrun-3.4.0.final/CMakeLists.txt
+===================================================================
+--- fgrun-3.4.0.final.orig/CMakeLists.txt
++++ fgrun-3.4.0.final/CMakeLists.txt
+@@ -133,6 +133,9 @@
+ 
+ find_package(Boost REQUIRED)
+ find_package(ZLIB REQUIRED)
++find_package(Threads REQUIRED)
++find_package(EXPAT REQUIRED)
++
+ if (SHARED_FLTK)
+     #see http://sources.debian.net/src/fltk1.3/1.3.2-4/README.CMake.txt lines 200-240
+     find_package(FLTK REQUIRED NO_MODULE)
+@@ -143,6 +146,7 @@
+ endif (SHARED_FLTK)
+ find_package(OpenSceneGraph 2.8.1 REQUIRED osgText osgDB osgParticle osgUtil osgViewer osgGA)
+ find_package(SimGear ${FGRUN_VERSION} REQUIRED)
++find_package(OpenGL REQUIRED)
+ if (ENABLE_NLS)
+     find_package(Gettext)
+ endif (ENABLE_NLS)
+Index: fgrun-3.4.0.final/src/CMakeLists.txt
+===================================================================
+--- fgrun-3.4.0.final.orig/src/CMakeLists.txt
++++ fgrun-3.4.0.final/src/CMakeLists.txt
+@@ -74,6 +74,8 @@
+     ${PLATFORM_LIBS}
+     ${OPENGL_LIBRARIES}
+     ${CMAKE_DL_LIBS}
++    ${CMAKE_THREAD_LIBS_INIT}
++    ${EXPAT_LIBRARIES}
+     )
+ 
+ install(TARGETS fgrun RUNTIME DESTINATION bin)
diff -Nru fgrun-3.4.0.final/debian/patches/series fgrun-3.4.0.final/debian/patches/series
--- fgrun-3.4.0.final/debian/patches/series	2015-11-10 19:50:23.000000000 +0100
+++ fgrun-3.4.0.final/debian/patches/series	2016-07-11 10:10:44.000000000 +0200
@@ -2,3 +2,4 @@
 fix-scenery-dir-bug.diff
 kfreebsd.patch
 fix-cmake-dl
+find-and-link-libs.patch