diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec
index 1a934c9..3221055 100644
--- a/OpenSceneGraph.spec
+++ b/OpenSceneGraph.spec
@@ -29,7 +29,7 @@
 
 Name:           OpenSceneGraph
 Version:        %{srcvers}
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        High performance real-time graphics toolkit
 
 # The OSGPL is just the wxWidgets license.
@@ -123,8 +123,7 @@ optimizing low level graphics calls, and provides many additional utilities
 for rapid development of graphics applications.
 
 %prep
-%setup -q -c
-cd OpenSceneGraph-%{srcvers}
+%setup -q
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -154,15 +153,14 @@ sed -i -e 's,/lib,/%{_lib},' CMakeModules/FindFLTK.cmake
 # Kick out -pedantic
 sed -i -e 's, -pedantic,,' CMakeLists.txt
 
-cd ..
-
 %build
 mkdir -p BUILD
 pushd BUILD
 CFLAGS="${RPM_OPT_FLAGS} -pthread"
 CXXFLAGS="${RPM_OPT_FLAGS} -pthread"
-%cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_DOCUMENTATION=ON ../OpenSceneGraph-%{srcvers} \
+%cmake -DBUILD_OSG_EXAMPLES=ON -DBUILD_DOCUMENTATION=ON \
   %{?with_Collada:-DCOLLADA_INCLUDE_DIR=$(pkg-config collada-dom --variable=includedir)} \
+  .. \
   -Wno-dev
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -179,8 +177,8 @@ popd
 
 
 %files
-%doc OpenSceneGraph-%{srcvers}/{AUTHORS,NEWS,README}.txt
-%license OpenSceneGraph-%{srcvers}/LICENSE.txt
+%doc AUTHORS.txt NEWS.txt README.txt
+%license LICENSE.txt
 %{_bindir}/osgarchive
 %{_bindir}/osgconv
 %{_bindir}/osgversion
@@ -684,8 +682,8 @@ compile-time in a shared object library.
 %postun -n OpenThreads -p /sbin/ldconfig
 
 %files -n OpenThreads
-%doc OpenSceneGraph-%{srcvers}/{AUTHORS,NEWS,README}.txt
-%license OpenSceneGraph-%{srcvers}/LICENSE.txt
+%doc AUTHORS.txt NEWS.txt README.txt
+%license LICENSE.txt
 %{_libdir}/libOpenThreads.so.*
 
 # OpenThreads-devel
@@ -705,6 +703,10 @@ Development files for OpenThreads.
 %{_includedir}/OpenThreads
 
 %changelog
+* Sun Jan 08 2017 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.4.0-7
+- Get rid of additional OpenSceneGraph-%%version directory.
+- Tidy-up %%changelog.
+
 * Thu Dec 29 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 3.4.0-6
 - Add Collada plugin subpackage.
 - Add OpenEXR plugin subpackage.
@@ -1006,67 +1008,15 @@ Development files for OpenThreads.
 * Fri Jun 22 2007 Ralf Corsépius <rc040203@freenet.de> - 2.0-1
 - Upgrade to 2.0.
 
-* Thu Jun 21 2007 Ralf Corsépius <rc040203@freenet.de> - 1.2-4
-- ExcludeArch: ppc64 (BZ 245192, 245196).
-
-* Thu Jun 21 2007 Ralf Corsépius <rc040203@freenet.de> - 1.2-3
-- Remove demeter (Defective, abandoned by upstream).
-
-* Wed Mar 21 2007 Ralf Corsépius <rc040203@freenet.de> - 1.2-2
-- Attempt to build with gdal enabled.
-
 * Thu Oct 05 2006 Ralf Corsépius <rc040203@freenet.de> - 1.2-1
 - Upstream update.
-- Remove BR: flex bison.
-- Drop osgfbo and osgpbuffer.
-
-* Tue Sep 05 2006 Ralf Corsépius <rc040203@freenet.de> - 1.1-2
-- Mass rebuild.
 
 * Thu Aug 24 2006 Ralf Corsépius <rc040203@freenet.de> - 1.1-1
 - Upstream update.
 
-* Sat Jul 08 2006 Ralf Corsépius <rc040203@freenet.de> - 1.0-5
-- Rebuilt to with gcc-4.1.1-6.
-
-* Wed Jun 07 2006 Ralf Corsépius <rc040203@freenet.de> - 1.0-4
-- Try to avoid adding SONAMEs on plugins and applications.
-
-* Tue Jun 06 2006 Ralf Corsépius <rc040203@freenet.de> - 1.0-3
-- Add SONAME hack to spec (PR 193934).
-- Regenerate OpenSceneGraph-1.0.diff.
-- Remove OpenSceneGraph-1.0.diff from look-aside cache. Add to CVS instead.
-- Fix broken shell fragments.
-
-* Sun Feb 19 2006 Ralf Corsépius <rc040203@freenet.de> - 1.0-2
-- Rebuild.
-
 * Sat Dec 10 2005 Ralf Corsépius <rc040203@freenet.de> - 1.0-1
 - Upstream update.
 
-* Wed Dec 07 2005 Ralf Corsépius <rc040203@freenet.de> - 0.9.9-5
-- Try at getting this package buildable with modular X11.
-
-* Tue Dec 06 2005 Ralf Corsepius <rc040203@freenet.de> - 0.9.9-4%{?dist}.1
-- Merge diffs into one file.
-- Fix up *.pcs from inside of *.spec.
-
-* Sun Aug 28 2005 Ralf Corsepius <rc040203@freenet.de> - 0.9.9-4
-- Propagate %%_libdir to pkgconfig files.
-- Fix typo in %%ifarch magic to setup LD_LIBRARY_PATH
-- Move configuration to %%build.
-- Spec file cosmetics.
-
-* Sat Aug 27 2005 Ralf Corsepius <rc040203@freenet.de> - 0.9.9-3
-- Add full URL to Debian patch.
-- Add _with_demeter.
-- Extend Producer %%description.
-- Extend OpenThreads %%description.
-
-* Tue Aug 09 2005 Ralf Corsepius <ralf@links2linux.de> - 0.9.9-2
-- Fix license to OSGPL.
-- Change permissions on pkgconfig files to 0644.
-
 * Tue Aug 02 2005 Ralf Corsepius <ralf@links2linux.de> - 0.9.9-1
 - FE submission.