diff --git a/_service b/_service
index d10a4a6..c4e9814 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="url">https://gitlab.suse.de/samba/suse-samba.git/</param>
 		<param name="scm">git</param>
-		<param name="revision">factory-4-7-stable</param>
+		<param name="revision">factory-4-8-stable</param>
 		<param name="versionformat">@PARENT_TAG@+git.@TAG_OFFSET@.%h</param>
 		<param name="versionrewrite-pattern">samba(.*)</param>
 		<param name="versionrewrite-replacement">\1</param>
diff --git a/samba-4.7.6+git.54.6e3276c9872.tar.bz2 b/samba-4.7.6+git.54.6e3276c9872.tar.bz2
deleted file mode 100644
index 360079f..0000000
--- a/samba-4.7.6+git.54.6e3276c9872.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6b07539eb63908ce17f277264a07116978ff860bbb870de5f4fbb10af1bcfa0
-size 21972587
diff --git a/samba-4.8.0+git.19.f53c6c0aa6f.tar.bz2 b/samba-4.8.0+git.19.f53c6c0aa6f.tar.bz2
new file mode 100644
index 0000000..3922781
--- /dev/null
+++ b/samba-4.8.0+git.19.f53c6c0aa6f.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7241a8a63e2c02c9ccfb486f0ca132d72603d5cb3ad5878ca8e1d5a43a955914
+size 24210182
diff --git a/samba.changes b/samba.changes
index 5929ae7..ff8b8bb 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,47 @@
+-------------------------------------------------------------------
+Mon Mar 26 22:37:15 UTC 2018 - jengelh@inai.de
+
+- Specfile cleanup
+  + Remove %if..%endif guards which don't affect the build
+  + Remove redundant %clean section
+  + Replace old $RPM_* shell vars with macros
+
+-------------------------------------------------------------------
+Thu Mar 22 16:28:02 UTC 2018 - dimstar@opensuse.org
+
+- BuildRequire pkgconfig(systemd) and pkgconfig(libsystemd) in
+  place of systemd and systemd-devel: Allow OBS to optimize the
+  workload by allowing the usage of the 'build-optimized' systemd
+  packages.
+
+-------------------------------------------------------------------
+Thu Mar 22 14:20:44 UTC 2018 - dmulder@suse.com
+
+- Enable building samba with python3, and create a samba-python3 package.
+
+-------------------------------------------------------------------
+Thu Mar 15 11:29:04 UTC 2018 - jmcdonough@suse.com
+
+- Update to 4.8
+  + New GUID Index mode in sam.ldb for the AD DC
+  + GPO support for samba KDC
+  + Time machine support with vfs_fruit
+  + Encrypted secrets
+  + AD Replication visualization
+  + Improved trust support
+    - ability to not scan global trust list
+    - AD external trusts have limited support
+    - verbose trusted domain listing
+  + VirusFilter VFS module
+  + NT4-style replication removed
+  + vfs_aio_linux removed
+
+-------------------------------------------------------------------
+Tue Mar 13 20:12:10 UTC 2018 - david.mulder@suse.com
+
+- Disable samba-pidl package, due to the removal of dependency
+  perl-Parse-Yapp; (bsc#1085150);
+
 -------------------------------------------------------------------
 Tue Mar 13 09:49:44 UTC 2018 - jmcdonough@suse.com
 
diff --git a/samba.spec b/samba.spec
index 9ae72fc..16de062 100644
--- a/samba.spec
+++ b/samba.spec
@@ -15,6 +15,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%if 0%{?sle_version} >= 150000
+%define with_python3 1
+%else
+%define with_python3 0
+%endif
 
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
@@ -38,6 +43,13 @@
 %define with_python 1
 %endif
 
+%if 0%{?sle_version} >= 150000 && !0%{?is_opensuse}
+# SLE15 dropped perl-Parse-Yapp
+%define with_pidl 0
+%else
+%define with_pidl 1
+%endif
+
 %if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315
 %define         build_ctdb_pmda 1
 %endif
@@ -100,6 +112,10 @@ BuildRequires:  popt-devel
 BuildRequires:  pwdutils
 BuildRequires:  python-devel
 BuildRequires:  python-xml
+%if %{with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-xml
+%endif
 BuildRequires:  readline-devel
 %if 0%{?suse_version} >= 1330
 BuildRequires:  rpcgen
@@ -117,6 +133,12 @@ BuildRequires:  python-ldb-devel
 BuildRequires:  python-talloc-devel
 BuildRequires:  python-tdb
 BuildRequires:  python-tevent
+%if %{with_python3}
+BuildRequires:  python3-ldb-devel
+BuildRequires:  python3-talloc-devel
+BuildRequires:  python3-tdb
+BuildRequires:  python3-tevent
+%endif
 # to generate the man pages
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libxslt
@@ -127,8 +149,8 @@ BuildRequires:  libxslt-tools
 %if 0%{?suse_version} > 1220
 BuildRequires:  libavahi-devel
 # To only BuildRequire systemd-rpm-macros leads to broken binaries
-BuildRequires:  systemd
-BuildRequires:  systemd-devel
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(libsystemd)
 %endif
 %if 0%{?build_ctdb_pmda}
 BuildRequires:  libpcp-devel
@@ -153,7 +175,7 @@ BuildRequires:  krb5-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        4.7.6+git.54.6e3276c9872
+Version:        4.8.0+git.19.f53c6c0aa6f
 Release:        0
 Url:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -279,9 +301,6 @@ Conflicts:      samba-devel
 This package contains the libraries and header files needed to
 develop programs which make use of Samba.
 
-
-%if 0%{?suse_version} > 1110
-
 %package doc
 Summary:        Samba Documentation
 License:        GPL-3.0+
@@ -298,10 +317,6 @@ BuildArch:      noarch
 This package contains all the Samba documentation as it is not part of
 the man pages.
 
-
-
-%endif
-
 %package libs
 Summary:        Samba libraries
 License:        GPL-3.0+
@@ -316,25 +331,22 @@ Requires:       libfam0-gamin
 The samba-libs package contains the libraries needed by programs that
 link against the SMB, RPC and other protocols provided by the Samba suite.
 
-
-
 %package pidl
 Summary:        Perl IDL compiler
 License:        GPL-3.0+
 Group:          Development/Tools
 Requires:       perl-base
 Requires:       perl-Parse-Yapp
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description pidl
 The samba-pidl package contains the Perl IDL compiler used by Samba
 and Wireshark to parse IDL and similar protocols
 
-
 %package python
 Summary:        Samba Python libraries
 License:        GPL-3.0+
-Group:          Applications/System
+Group:          Development/Libraries/Python
 %if %{with_python}
 Requires:       %{name} = %{version}
 Requires:       python-ldb
@@ -347,6 +359,19 @@ Requires:       python-tevent
 The samba-python package contains the Python libraries needed by programs
 that use SMB, RPC and other Samba provided protocols in Python programs.
 
+%package python3
+Summary:        Samba Python3 libraries
+License:        GPL-3.0+
+Group:          Development/Libraries/Python
+Requires:       %{name} = %{version}
+Requires:       python3-ldb
+Requires:       python3-talloc
+Requires:       python3-tdb
+Requires:       python3-tevent
+
+%description python3
+The samba-python3 package contains the Python libraries needed by programs
+that use SMB, RPC and other Samba provided protocols in Python3 programs.
 
 %package test
 Summary:        Testing tools for Samba servers and clients
@@ -407,9 +432,6 @@ Requires(pre): sed
 %description -n ctdb
 ctdb is the clustered database used by Samba
 
-
-
-%if 0%{?build_ctdb_pmda}
 %package -n ctdb-pcp-pmda
 Summary:        Performance Co-Pilot (PCP) monitoring agent
 License:        GPL-3.0+
@@ -419,7 +441,6 @@ Group:          System/Monitoring
 The CTDB Performance Co-Pilot (PCP) monitoring agent allows remote PCP
 clients to view and capture detailed real-time performance metrics for
 one or more cluster nodes.
-%endif
 
 %package -n ctdb-tests
 Summary:        CTDB clustered database test suite
@@ -896,8 +917,6 @@ Requires:       %{libwbclient_name} = %{version}
 This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.
 
-
-%if 0%{?build_ceph}
 %package ceph
 Summary:        Ceph specific add-ons for Samba
 License:        GPL-3.0+
@@ -908,7 +927,6 @@ Requires:       samba = %{version}
 The Ceph VFS module for Samba allows shares to be backed by the Ceph
 distributed file system. A Ceph CTDB lock helper binary is included so
 that RADOS locks can be used for CTDB split-brain avoidance.
-%endif
 
 %package kdc
 Summary:        Samba MIT KDC
@@ -941,7 +959,7 @@ LDB library.
 install -m 0644 -p vendor-files-%{vendor_files_git_vers}/docu/rfc3454.txt source4/heimdal/lib/wind/
 # Create and add vendor suffix
 if test "%{_project}" != "openSUSE:Factory"; then
-	vendor_tag_release=$( grep -m 1 ^Release: ${RPM_SOURCE_DIR}/samba.spec | \
+	vendor_tag_release=$( grep -m 1 ^Release: %{_sourcedir}/samba.spec | \
 		while read tag release; do \
 			echo -n "${release:+${release}-}"; \
 		done)
@@ -1027,9 +1045,12 @@ CONFIGURE_OPTIONS="\
 	--without-ad-dc \
 %endif
 %if ! %{with_python}
-	--disable-python
+	--disable-python \
 %endif
 	--bundled-libraries=NONE,socket_wrapper,cmocka,${bundled_libraries_extra} \
+%if %{with_python3}
+    --extra-python=/usr/bin/python3 \
+%endif
 "
 ./configure ${CONFIGURE_OPTIONS}
 make %{build_make_smp_mflags} \
@@ -1045,7 +1066,7 @@ XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml" make
 popd
 
 pushd pidl
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 popd
 
 %install
@@ -1107,7 +1128,7 @@ ln -s service %{buildroot}/%{_sbindir}/rcctdb
 install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
 echo "d /run/ctdbd 0755 root root" >%{buildroot}/%{_tmpfilesdir}/ctdb.conf
 %else
-install -m 0755 ctdb/config/ctdb.init ${RPM_BUILD_ROOT}/%{INITDIR}/ctdb
+install -m 0755 ctdb/config/ctdb.init %{buildroot}/%{INITDIR}/ctdb
 ln -s %{_sysconfdir}/init.d/ctdb %{buildroot}/%{_sbindir}/rcctdb
 %endif
 mkdir %{buildroot}/%{_defaultdocdir}/ctdb
@@ -1116,7 +1137,7 @@ for file in README COPYING doc/examples doc/*.html doc/readonlyrecords.txt doc/r
 done
 touch %{buildroot}/%{_sysconfdir}/ctdb/nodes
 # sudo can be used by statd-callout, but is not needed
-rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/sudoers.d/ctdb
+rm %{buildroot}/%{_sysconfdir}/sudoers.d/ctdb
 
 # utility scripts
 scripts="creategroup mksmbpasswd.sh"
@@ -1230,9 +1251,9 @@ install -m 0644 config/sysconfig.firewall.samba-client \
 	LOGROTATE_FILES="samba samba-winbind"
 for file in ${LOGROTATE_FILES}; do
 	install -m 0644 logrotate/${file} %{buildroot}/%{_sysconfdir}/logrotate.d/${file}
-	rm -f "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}"
-	touch "${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}"
-	echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-${file}
+	rm -f "%{_builddir}/samba-%{version}/filelist-${file}"
+	touch "%{_builddir}/samba-%{version}/filelist-${file}"
+	echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>%{_builddir}/samba-%{version}/filelist-${file}
 done
 install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/
 # SUSEhelp files
@@ -1266,14 +1287,14 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do
 	case "${file#%{buildroot}}" in
 		%{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;;
 	esac
-	echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{version}/filelist-samba-doc"
+	echo "%doc ${file#%{buildroot}}" >>"%{_builddir}/samba-%{version}/filelist-samba-doc"
 done
 for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do
 	# if built we don't want vfs_ceph in the base package
 	case "${file#%{buildroot}}" in
 		%{_libdir}/samba/vfs/ceph.so) continue ;;
 	esac
-	echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-samba
+	echo "${file#%{buildroot}}" >>%{_builddir}/samba-%{version}/filelist-samba
 done
 # only package Man pages for VFS modules that we ship
 for file in %{buildroot}%{_mandir}/man8/vfs_*; do
@@ -1298,7 +1319,7 @@ for file in %{buildroot}%{_mandir}/man8/vfs_*; do
 			;;
 	esac
 	# wildcard suffix to account for subsequent gzip
-	echo "${file#%{buildroot}}*" >>${RPM_BUILD_DIR}/samba-%{version}/filelist-samba
+	echo "${file#%{buildroot}}*" >>%{_builddir}/samba-%{version}/filelist-samba
 done
 # copy the schema
 install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema
@@ -1307,7 +1328,7 @@ install -m 0644 examples/LDAP/samba-nds.schema %{buildroot}/%{_datadir}/samba/LD
 %if 0%{?suse_version} < 1120
 while read file; do
 	rm -r "%{buildroot}/${file#%* }"
-done <"${RPM_BUILD_DIR}/samba-%{version}/filelist-samba-doc"
+done <"%{_builddir}/samba-%{version}/filelist-samba-doc"
 for file in %{_datadir}/susehelp; do
 	rm -r "%{buildroot}/${file}"
 done
@@ -1481,8 +1502,10 @@ fi
 %postun -n %{libwbclient_name} -p /sbin/ldconfig
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
+%if %{with_pidl}
 %post pidl -p /sbin/ldconfig
 %postun pidl -p /sbin/ldconfig
+%endif
 %post test -p /sbin/ldconfig
 %postun test -p /sbin/ldconfig
 
@@ -1582,12 +1605,6 @@ exit 0
 %post -n %{libsmbclient_name} -p /sbin/ldconfig
 %postun -n %{libsmbclient_name} -p /sbin/ldconfig
 
-%clean
-[ x"%{buildroot}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "%{buildroot}"
-if [ -e ${RPM_SOURCE_DIR}/baselibs.conf -a 0%{?suse_version} -gt 0 -a 0%{?suse_version} -lt 1110 ]; then
-sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf
-fi
-
 %files -f filelist-samba
 %defattr(-,root,root)
 %if 0%{?suse_version} < 1221
@@ -1845,7 +1862,7 @@ fi
 %{_libdir}/samba/libflag-mapping-samba4.so
 %{_libdir}/samba/libgenrand-samba4.so
 %{_libdir}/samba/libgensec-samba4.so
-%{_libdir}/samba/libgpo-samba4.so
+%{_libdir}/samba/libgpext-samba4.so
 %{_libdir}/samba/libgse-samba4.so
 %{_libdir}/samba/libhttp-samba4.so
 %{_libdir}/samba/libidmap-samba4.so
@@ -1914,6 +1931,7 @@ fi
 %{_libdir}/samba/pdb/smbpasswd.so
 %{_libdir}/samba/pdb/tdbsam.so
 
+%if %{with_pidl}
 %files pidl
 %defattr(-,root,root)
 %dir %{perl_vendorlib}/Parse
@@ -1926,7 +1944,15 @@ fi
 # both are part of perl-Parse-Yapp
 %exclude %dir %{perl_vendorlib}/Parse/Yapp
 %exclude %{perl_vendorlib}/Parse/Yapp/Driver.pm
-
+%else
+%exclude %{perl_vendorlib}/Parse/Pidl.pm*
+%exclude %{perl_vendorlib}/Parse/Pidl/*
+%exclude %{_mandir}/man1/pidl.1.*
+%exclude %{_mandir}/man3/Parse::Pidl::*.3pm.*
+%exclude %{_bindir}/pidl
+%exclude %dir %{perl_vendorlib}/Parse/Yapp
+%exclude %{perl_vendorlib}/Parse/Yapp/Driver.pm
+%endif
 
 %files python
 %defattr(-,root,root)
@@ -1936,6 +1962,12 @@ fi
 %exclude %{python_sitearch}/*
 %endif
 
+%if %{with_python3}
+%files python3
+%defattr(-,root,root)
+%{python3_sitearch}/*
+%endif
+
 %files test
 %defattr(-,root,root)
 %{_bindir}/gentest
@@ -1945,6 +1977,8 @@ fi
 %if %{with_python}
 %{_bindir}/smbtorture
 %{_mandir}/man1/smbtorture.1.*
+%{_mandir}/man7/traffic_learner.7.*
+%{_mandir}/man7/traffic_replay.7.*
 %endif
 %{_bindir}/vfstest
 %{_mandir}/man1/gentest.1.*
@@ -1968,6 +2002,7 @@ fi
 %{_bindir}/wbinfo
 %{_sbindir}/rcwinbind
 %{_sbindir}/winbindd
+%{_sbindir}/samba_gpoupdate
 /%{_lib}/security/pam_winbind.so
 %{_libdir}/libnss_winbind.so.*
 %{_libdir}/samba/idmap
@@ -1977,6 +2012,7 @@ fi
 %{_mandir}/man1/wbinfo.1.*
 %{_mandir}/man7/winbind_krb5_locator.7.*
 %{_mandir}/man5/pam_winbind.conf.5.*
+%{_mandir}/man8/samba_gpoupdate.8.gz
 %{_mandir}/man8/idmap_ad.8.*
 %{_mandir}/man8/idmap_autorid.8.*
 %{_mandir}/man8/idmap_hash.8.*
@@ -2531,6 +2567,7 @@ fi
 %{_libdir}/samba/ldb/dirsync.so
 %{_libdir}/samba/ldb/dns_notify.so
 %{_libdir}/samba/ldb/dsdb_notification.so
+%{_libdir}/samba/ldb/encrypted_secrets.so
 %{_libdir}/samba/ldb/extended_dn_in.so
 %{_libdir}/samba/ldb/extended_dn_out.so
 %{_libdir}/samba/ldb/extended_dn_store.so
@@ -2565,6 +2602,7 @@ fi
 %{_libdir}/samba/ldb/subtree_delete.so
 %{_libdir}/samba/ldb/subtree_rename.so
 %{_libdir}/samba/ldb/tombstone_reanimate.so
+%{_libdir}/samba/ldb/unique_object_sids.so
 %{_libdir}/samba/ldb/update_keytab.so
 %{_libdir}/samba/ldb/vlv.so
 %{_libdir}/samba/ldb/wins_ldb.so