diff --git a/samba.changes b/samba.changes
index 5fdc745..c4056c2 100644
--- a/samba.changes
+++ b/samba.changes
@@ -74,6 +74,13 @@ Fri Feb  9 13:25:11 UTC 2018 - scabrero@suse.com
   + vfs_glusterfs: include glusterfs/api/glfs.h without relying on "-I"
     options; (bso#13125);
 
+-------------------------------------------------------------------
+Wed Dec  6 17:52:41 UTC 2017 - kukuk@suse.de
+
+- Re-enable usage of libnsl (did got lost with glibc change)
+- Use TI-RPC (sunrpc is deprecated and will be removed soon from
+  glibc)
+
 -------------------------------------------------------------------
 Wed Nov 29 16:59:07 UTC 2017 - david.mulder@suse.com
 
diff --git a/samba.spec b/samba.spec
index 8a7ae2c..8725c62 100644
--- a/samba.spec
+++ b/samba.spec
@@ -71,7 +71,13 @@ BuildRequires:  cracklib-devel
 BuildRequires:  gdbm-devel
 BuildRequires:  keyutils-devel
 BuildRequires:  libnscd-devel
+%if 0%{?suse_version} >= 1330
+BuildRequires:  libnsl-devel
+%endif
 BuildRequires:  libopenssl-devel
+%if 0%{?suse_version} >= 1330
+BuildRequires:  libtirpc-devel
+%endif
 BuildRequires:  ncurses-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  pam-devel
@@ -80,6 +86,9 @@ BuildRequires:  pwdutils
 BuildRequires:  python-devel
 BuildRequires:  python-xml
 BuildRequires:  readline-devel
+%if 0%{?suse_version} >= 1330
+BuildRequires:  rpcgen
+%endif
 %if 0%{?suse_version} > 1110
 BuildRequires:  fdupes
 %endif
@@ -1057,7 +1066,7 @@ if command -v ncurses6-config &> /dev/null; then
 	export NCURSES_CONFIG="$(command -v ncurses6-config)"
 fi
 
-export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS"
+export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS -I/usr/include/tirpc"
 %if 0%{?suse_version} < 1141
 %{?suse_update_config:%{suse_update_config -f}}
 %endif