diff --git a/.gitignore b/.gitignore
index 4f6021f..4f8c07e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /*.rpm
 /x86_64
 /realmd-0.16.0.tar.gz
+/realmd-0.16.1.tar.gz
diff --git a/0001-Fedora-fix-package-of-usr-bin-net.patch b/0001-Fedora-fix-package-of-usr-bin-net.patch
deleted file mode 100644
index ed0898e..0000000
--- a/0001-Fedora-fix-package-of-usr-bin-net.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 798aa84cf45fae4b4f78d4abda9d992fb3e8d062 Mon Sep 17 00:00:00 2001
-From: Stephen Gallagher <sgallagh@redhat.com>
-Date: Thu, 9 Apr 2015 16:30:15 -0400
-Subject: [PATCH] Fedora: fix package of /usr/bin/net
-
----
- service/realmd-redhat.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/service/realmd-redhat.conf b/service/realmd-redhat.conf
-index e0bfbf55dcf05dd1dd1f7ff650099f33033e3aa9..e39fad525c716d1ed99715280cd5d497b9039427 100644
---- a/service/realmd-redhat.conf
-+++ b/service/realmd-redhat.conf
-@@ -1,11 +1,11 @@
- # Distro specific overrides for redhat
- [paths]
- smb.conf = /etc/samba/smb.conf
- 
- [samba-packages]
--samba-common = /usr/bin/net
-+samba-common-tools = /usr/bin/net
- 
- [winbind-packages]
- samba-winbind = /usr/sbin/winbindd
- samba-winbind-clients = /usr/bin/wbinfo
- oddjob = /usr/sbin/oddjobd
--- 
-2.3.4
-
diff --git a/realmd.spec b/realmd.spec
index fecbac6..5e895eb 100644
--- a/realmd.spec
+++ b/realmd.spec
@@ -1,6 +1,11 @@
 Name:		realmd
+<<<<<<< HEAD
 Version:	0.16.0
 Release:	2%{?dist}
+=======
+Version:	0.16.1
+Release:	1%{?dist}
+>>>>>>> 9fe4111... Updated to upstream 0.16.1
 Summary:	Kerberos realm enrollment service
 License:	LGPLv2+
 URL:		http://cgit.freedesktop.org/realmd/realmd/
@@ -18,9 +23,6 @@ BuildRequires:	xmlto
 
 Requires:	authconfig
 
-Patch0001: 0001-Fedora-fix-package-of-usr-bin-net.patch
-
-
 %description
 realmd is a DBus system service which manages discovery and enrollment in realms
 and domains like Active Directory or IPA. The control center uses realmd as the
@@ -37,7 +39,6 @@ applications that use %{name}.
 
 %prep
 %setup -q
-%patch0001 -p1
 
 %build
 %configure --disable-silent-rules
@@ -71,6 +72,10 @@ make install DESTDIR=%{buildroot}
 %doc ChangeLog
 
 %changelog
+* Tue Jul 14 2015 Stef Walter <stefw@redhat.com> - 0.16.1-1
+- Updated to upstream 0.16.1
+- Resolves: rhbz#1231128
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.16.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 6120fae..c2d4a62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0978c8021c865a6e6c7e7e71eb426484  realmd-0.16.0.tar.gz
+050b87ca6bd1ed750f5b07fb458e3e85  realmd-0.16.1.tar.gz