diff --git a/.gitignore b/.gitignore
index 631d4f3..1178575 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ source-highlight-3.1.3.tar.gz
 source-highlight-3.1.3.tar.gz.sig
 source-highlight-3.1.4.tar.gz.sig
 source-highlight-3.1.4.tar.gz
+/source-highlight-3.1.6.tar.gz
+/source-highlight-3.1.6.tar.gz.sig
diff --git a/source-highlight.spec b/source-highlight.spec
index 343778f..eafa7d1 100644
--- a/source-highlight.spec
+++ b/source-highlight.spec
@@ -1,13 +1,12 @@
 Summary: Produces a document with syntax highlighting
 Name: source-highlight
-Version: 3.1.4
-Release: 10%{?dist}
+Version: 3.1.6
+Release: 1%{?dist}
 Group: Development/Tools
 License: GPLv3+
 Source0: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz
 Source1: ftp://ftp.gnu.org/gnu/src-highlite/%{name}-%{version}.tar.gz.sig
 URL: http://www.gnu.org/software/src-highlite/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison, flex, boost-devel
 BuildRequires: help2man, ctags, chrpath
 Requires(post): info
@@ -52,8 +51,7 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/source-highlight-settings
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+echo -e "\ncxx = cpp.lang" >> $RPM_BUILD_ROOT%{_datadir}/source-highlight/lang.map
 
 %post
 /sbin/ldconfig
@@ -78,7 +76,7 @@ fi
 %{_bindir}/source-highlight-settings
 %{_bindir}/src-hilite-lesspipe.sh
 %dir %{_sysconfdir}/bash_completion.d
-%{_sysconfdir}/bash_completion.d/source-highlight-bash-completion
+%{_sysconfdir}/bash_completion.d/source-highlight
 %{_libdir}/libsource-highlight.so.*
 %dir %{_datadir}/source-highlight
 %{_datadir}/source-highlight/*
@@ -91,9 +89,14 @@ fi
 %{_libdir}/libsource-highlight.so
 %{_libdir}/pkgconfig/source-highlight.pc
 %{_includedir}/srchilite/*.h
-%{_datadir}/aclocal/ax_boost_*.m4
 
 %changelog
+* Sun Mar 25 2012 Adrian Reber <adrian@lisas.de> - 3.1.6-1
+- updated to 3.1.6
+- removed buildroot and clean section
+- fixed "missing c++ source language detection for .cxx extension" (#728311)
+- fixed "source-highlight : Conflicts with autoconf-archive" (#797794)
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-10
 - Rebuilt for c++ ABI breakage
 
diff --git a/sources b/sources
index 2579135..921e3ef 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-ef28c8d10324a140fb0187ef769ce726  source-highlight-3.1.4.tar.gz.sig
-becf8292b84ece6b532b0f0c92b530ee  source-highlight-3.1.4.tar.gz
+44856c15a5dc8694e30d92f640ed348f  source-highlight-3.1.6.tar.gz
+6272621c5af418f1a104c4bdae3b31b1  source-highlight-3.1.6.tar.gz.sig