diff --git a/_service b/_service
deleted file mode 100644
index 2f2216e..0000000
--- a/_service
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<services>
-  <service name="tar_scm" mode="disabled">
-    <param name="url">https://gitlab.freedesktop.org/gstreamer/gst-plugins-base.git</param>
-    <param name="filename">gst-plugins-base</param>
-    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
-    <param name="versionrewrite-pattern">(.*)\+0</param>
-    <param name="versionrewrite-replacement">\1</param>
-<!--
-    <param name="changesgenerate">enable</param>
--->
-    <param name="revision">1.18.5</param>
-    <param name="scm">git</param>
-  </service>
-  <service name="recompress" mode="disabled">
-    <param name="compression">xz</param>
-    <param name="file">*.tar</param>
-  </service>
-  <service name="set_version" mode="disabled" />
-</services>
-
diff --git a/gst-plugins-base-1.18.5.tar.xz b/gst-plugins-base-1.18.5.tar.xz
deleted file mode 100644
index 7b20ff8..0000000
--- a/gst-plugins-base-1.18.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f74051458419bf5954360c1f0d50938d2e1672f9fde623eb799053952fff9cdd
-size 3175980
diff --git a/gst-plugins-base-1.18.6.tar.xz b/gst-plugins-base-1.18.6.tar.xz
new file mode 100644
index 0000000..7f7c49d
--- /dev/null
+++ b/gst-plugins-base-1.18.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56a9ff2fe9e6603b9e658cf6897d412a173d2180829fe01e92568549c6bd0f5b
+size 3180564
diff --git a/gstreamer-plugins-base.changes b/gstreamer-plugins-base.changes
index 34de902..85978c3 100644
--- a/gstreamer-plugins-base.changes
+++ b/gstreamer-plugins-base.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Fri Feb  4 19:15:19 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.18.6:
+  + tagdemux: Fix crash when presented with malformed files
+    (security fix)
+  + videoencoder: make sure the buffer is writable before modifying
+    metadata
+  + video-converter: Fix for broken gamma remap with high bitdepth
+    YUV output
+  + sdpmessage: fix mapping single char fmtp params
+  + oggdemux: fix a race in push mode when performing the duration
+    seek
+  + uridecodebin: Fix critical warnings
+  + audio-converter: Fix resampling when there's nothing to output
+  + tcp: fix build on Solaris
+  + uridecodebin3: Nullify current item after all play items are
+    freed.
+  + audio-resampler: Fix segfault when we can't output any frames
+  + urisourcebin: Handle sources with dynamic pads and pads already
+    present
+  + playbin2/3: autoplug/caps: don't expand caps to ANY
+  + uridecodebin3/urisourcebin: Reusability fixes
+  + rtspconnection: Only reset timeout when socket is unused
+  + gstvideoaggregator.c: fix build with gcc 4.8
+- Drop service, use source url, upstream changes in git.
+
 -------------------------------------------------------------------
 Thu Sep 16 09:14:32 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec
index 6e9b09c..2a63c8d 100644
--- a/gstreamer-plugins-base.spec
+++ b/gstreamer-plugins-base.spec
@@ -20,17 +20,16 @@
 %define gst_branch 1.0
 %define gstreamer_req_version %(echo %{version} | sed -e "s/+.*//")
 Name:           gstreamer-plugins-base
-Version:        1.18.5
+Version:        1.18.6
 Release:        0
 Summary:        GStreamer Streaming-Media Framework Plug-Ins
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Productivity/Multimedia/Other
 URL:            https://gstreamer.freedesktop.org
-# Disable tarball source url, use _service
-#Source0:        %%{url}/src/gst-plugins-base/%%{_name}-%%{version}.tar.xz
-Source0:        %{_name}-%{version}.tar.xz
+Source0:        %{url}/src/gst-plugins-base/%{_name}-%{version}.tar.xz
 Source1:        gstreamer-plugins-base.appdata.xml
 Source2:        baselibs.conf
+
 # PATCH-FIX-OPENSUSE gstreamer-plugins-base-gl-deps.patch dimstar@opensuse.org -- Local workaround for https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/735
 Patch3:         gstreamer-plugins-base-gl-deps.patch
 Patch4:         add_wayland_dep_to_tests.patch