diff --git a/.gitignore b/.gitignore
index 78d8e8c..fb89800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ FlightGear-2.0.0.tar.gz
 /flightgear-3.0.0.tar.bz2
 /flightgear-3.2.0.tar.bz2
 /flightgear-3.4.0.tar.bz2
+/flightgear-3.7.0-f4fa687.tar.bz2
diff --git a/FlightGear.spec b/FlightGear.spec
index 8977c24..f02bdc4 100644
--- a/FlightGear.spec
+++ b/FlightGear.spec
@@ -1,9 +1,17 @@
+%global gittag		f4fa68754bcab781a6f946790f6bbc95240b2a3f
+%global shorttag	%(c=%{gittag}; echo ${c:0:7})
+
 Name:           FlightGear
 Summary:        The FlightGear Flight Simulator
-Version:        3.4.0
-Release:        7%{?dist}
+Version:        3.7.0
+Release:        1.git%{shorttag}%{?dist}
 License:        GPLv2+
-Source0:        http://mirrors.ibiblio.org/flightgear/ftp/Source/flightgear-%{version}.tar.bz2
+# git clone http://git.code.sf.net/p/flightgear/flightgear flightgear-3.7.0
+# cd flightgear-3.7.0/
+# We're actually going with trunk for right now, because it has useful bugfixes.
+# cd ..
+# tar --exclude-vcs -cjf flightgear-3.7.0-f4fa687.tar.bz2 flightgear-3.7.0
+Source0:	flightgear-%{version}-%{shorttag}.tar.bz2
 Source1:        %{name}.desktop
 # these icons were previously available from
 # http://jrbabcock.home.comcast.net/flightgear/icons
@@ -18,8 +26,6 @@ Patch2:         0002-make-ShivaVG-and-FGAdminUI-static-libraries.patch
 Patch3:         0003-Use-system-iaxclient-instead-of-bundled-one.patch
 Patch5:         0005-explicitely-link-with-libX11.patch
 Patch6:         0006-make-fglauncher-a-static-library.patch
-Patch7:         0007-Stop-using-property-listener-for-fgValidatePath.patch
-Patch8:         0008-Normalize-the-allowed-paths-as-well-fix-Windows-brea.patch
 
 URL:            http://www.flightgear.org/
 BuildRequires:  openal-soft-devel, SimGear-devel >= %{version}
@@ -44,8 +50,6 @@ expanded and improved upon by anyone interested in contributing
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
 rm -rf 3rdparty/iaxclient
 
 # make rpmlint happy
@@ -175,6 +179,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Sep 10 2015 Tom Callaway <spot@fedoraproject.org> - 3.7.0-1.gitf4fa687
+- update to 3.7.0 + fixes from git
+
 * Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 3.4.0-7
 - Rebuilt for Boost 1.59
 
diff --git a/sources b/sources
index 6600967..d081696 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a6f4c27baf64f3e7d58fd44612118df  flightgear-3.4.0.tar.bz2
+d0897e497b571cd30a079353c076796f  flightgear-3.7.0-f4fa687.tar.bz2