diff --git a/hostname.changes b/hostname.changes
index dae14a7..2c71b9d 100644
--- a/hostname.changes
+++ b/hostname.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Sep  8 12:32:33 UTC 2015 - nemysis@openSUSE.org
+
+- Update to 3.16, announce message:
+
+  * Changed buffer size to the recommended 255 character when working with
+    names instead of IPs. (Closes: #796922)
+  * Bumped Standards-Version to 3.9.6, no changes needed.
+
+- Use %{name} instead of hostname
+- Use CFLAGS="%{optflags}" to fix 'File is compiled without RPM_OPT_FLAGS'
+- Add changelog to Documentation
+
 -------------------------------------------------------------------
 Thu Jun 11 07:31:16 UTC 2015 - dimstar@opensuse.org
 
diff --git a/hostname.spec b/hostname.spec
index 02356fd..187ff1a 100644
--- a/hostname.spec
+++ b/hostname.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package hostname
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,14 +15,15 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           hostname
-Version:        3.15
+Version:        3.16
 Release:        0
-License:        GPL-2.0+
 Summary:        Utility to Set/Show the Host Name or Domain Name
-Url:            https://tracker.debian.org/pkg/hostname
+License:        GPL-2.0+
 Group:          Productivity/Networking/Other
-Source:         http://http.debian.net/debian/pool/main/h/hostname/%{name}_%{version}.tar.gz
+Url:            https://tracker.debian.org/pkg/hostname
+Source:         http://http.debian.net/debian/pool/main/h/%{name}/%{name}_%{version}.tar.gz
 # net-tools requires hostname, but we know we do not rely on ourselves to build
 #!BuildIgnore:  hostname
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -32,32 +33,34 @@ This package provides commands which can be used to display the system's DNS
 name, and to display or set its hostname or NIS domain name.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
-install -D -p -m 755 hostname %{buildroot}%{_bindir}/hostname
+install -D -p -m 755 %{name} %{buildroot}%{_bindir}/%{name}
 install -d -m 755 %{buildroot}/bin/
-ln -sf %{_bindir}/hostname %{buildroot}/bin/hostname
-install -D -p -m 644 hostname.1 %{buildroot}%{_mandir}/man1/hostname.1
+ln -sf %{_bindir}/%{name} %{buildroot}/bin/%{name}
+install -D -p -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 # do not install ypdomainname and nisdomainname which are provided by yp-tools
 for prog in dnsdomainname domainname; do
-    ln -sf %{_bindir}/hostname %{buildroot}/bin/$prog
-    ln -sf %{_bindir}/hostname %{buildroot}%{_bindir}/$prog
+    ln -sf %{_bindir}/%{name} %{buildroot}/bin/$prog
+    ln -sf %{_bindir}/%{name} %{buildroot}%{_bindir}/$prog
     ln -sf hostname.1 %{buildroot}%{_mandir}/man1/${prog}.1
 done
 
 %files
 %defattr(-,root,root)
-%doc COPYRIGHT
-/bin/hostname
+%doc COPYRIGHT debian/changelog
+/bin/%{name}
 /bin/domainname
 /bin/dnsdomainname
-%{_bindir}/hostname
+%{_bindir}/%{name}
 %{_bindir}/domainname
 %{_bindir}/dnsdomainname
-%{_mandir}/man1/hostname.1*
-%{_mandir}/man1/domainname.1*
-%{_mandir}/man1/dnsdomainname.1*
+%{_mandir}/man1/%{name}.1%{ext_man}
+%{_mandir}/man1/domainname.1%{ext_man}
+%{_mandir}/man1/dnsdomainname.1%{ext_man}
+
+%changelog
diff --git a/hostname_3.15.tar.gz b/hostname_3.15.tar.gz
deleted file mode 100644
index 38c3487..0000000
--- a/hostname_3.15.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b6d10114ed14306b21745d2cac1b9adf7a2546f16b9fd719bec14bd7cec61d20
-size 13039
diff --git a/hostname_3.16.tar.gz b/hostname_3.16.tar.gz
new file mode 100644
index 0000000..0210af7
--- /dev/null
+++ b/hostname_3.16.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40c6dc0b4fb36ffefe92e9572f679c377f4486ed4010302732175e743c9e269b
+size 13225