diff --git a/_service b/_service
index 82064d7..9c3528e 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="version">13.2</param>
-    <param name="versionformat">13.2+git%cd.%h</param>
+    <param name="version">84.87</param>
+    <param name="versionformat">84.87+git%cd.%h</param>
     <param name="url">git://github.com/openSUSE/aaa_base.git</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
diff --git a/_servicedata b/_servicedata
index 79b495a..1124351 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">git://github.com/openSUSE/aaa_base.git</param>
-          <param name="changesrevision">8f12a9e0796fb53980ea55e3911e4399fdfeb320</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">d36b8b114ae6d2526b414aa1cbe8b44e5dfafe49</param></service></servicedata>
\ No newline at end of file
diff --git a/aaa_base-13.2+git20170828.8f12a9e.tar.xz b/aaa_base-13.2+git20170828.8f12a9e.tar.xz
deleted file mode 100644
index ef2d07b..0000000
--- a/aaa_base-13.2+git20170828.8f12a9e.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c92dac8b95bc7f3fb59fc6c7a2e517b2e99bb412e36f835e648040c58c18f06
-size 80712
diff --git a/aaa_base-84.87+git20171120.d36b8b1.tar.xz b/aaa_base-84.87+git20171120.d36b8b1.tar.xz
new file mode 100644
index 0000000..d3e16f5
--- /dev/null
+++ b/aaa_base-84.87+git20171120.d36b8b1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0245b969dec8c1a9aba3ba71d57828cbf2c7cc1efbd1538b19c3e4ce01bd62e
+size 80532
diff --git a/aaa_base.changes b/aaa_base.changes
index a54fad6..1cfc67e 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:39:19 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+-------------------------------------------------------------------
+Mon Nov 20 09:43:26 UTC 2017 - lnussel@suse.de
+
+- use TW versioning, 13.2 is misleading
+- Update to version 84.87+git20171120.d36b8b1:
+  * Fix double sourcing of /etc/bash_completion.d
+  * create wsl.sh in /etc/profile.d to set umask in WSL
+  * Add support for /usr/bin/fish (boo#1068840)
+  * Get mixed use case of service wrapper script straight (bsc#1040613)
+
 -------------------------------------------------------------------
 Wed Aug 30 08:29:57 CEST 2017 - kukuk@suse.de
 
diff --git a/aaa_base.spec b/aaa_base.spec
index e5ddeef..b7414ae 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -17,8 +17,13 @@
 # icecream 0
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 Name:           aaa_base
-Version:        13.2+git20170828.8f12a9e
+Version:        84.87+git20171120.d36b8b1
 Release:        0
 Url:            https://github.com/openSUSE/aaa_base
 Provides:       aaa_skel = %{version}-%{release}
@@ -82,6 +87,16 @@ This package sets environment variables that enable stricter
 malloc checks to catch potential heap corruptions. It's not
 installed by default as it may degrade performance.
 
+%package wsl
+Summary:        SUSE Linux Base Package (Windows Subsystem for Linux)
+Group:          System/Fhs
+Requires:       %{name} = %{version}
+
+%description wsl
+This package includes some special settings needed on Windows Subsystem
+for Linux. It should only be installed on WSL and not on regular Linux
+systems.
+
 %prep
 %setup -q
 
@@ -194,11 +209,11 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 /usr/lib/sysctl.d/*.conf
 %dir /usr/lib/initscripts
 %dir /usr/lib/initscripts/legacy-actions
-/var/adm/fillup-templates/sysconfig.backup
-/var/adm/fillup-templates/sysconfig.language
-/var/adm/fillup-templates/sysconfig.news
-/var/adm/fillup-templates/sysconfig.proxy
-/var/adm/fillup-templates/sysconfig.windowmanager
+%{_fillupdir}/sysconfig.backup
+%{_fillupdir}/sysconfig.language
+%{_fillupdir}/sysconfig.news
+%{_fillupdir}/sysconfig.proxy
+%{_fillupdir}/sysconfig.windowmanager
 
 %files extras
 %defattr(-,root,root)
@@ -228,4 +243,8 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %config /etc/profile.d/malloc-debug.sh
 %config /etc/profile.d/malloc-debug.csh
 
+%files wsl
+%defattr(-,root,root)
+%config /etc/profile.d/wsl.sh
+
 %changelog