diff --git a/.devtoolset-8.metadata b/.devtoolset-8.metadata
index 92ef199..e69de29 100644
--- a/.devtoolset-8.metadata
+++ b/.devtoolset-8.metadata
@@ -1,2 +0,0 @@
-f40b3d3c096299ef90fe5fb5f8b4efda6ea6b7a7 SOURCES/devtoolset-7-perftools-docker-1c51b64.tar.bz2
-f3aa0f3fbd0b06991abfb0c9f4902cd39289e694 SOURCES/devtoolset-7-toolchain-docker-7356c45.tar.bz2
diff --git a/.gitignore b/.gitignore
index 6958d15..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +0,0 @@
-SOURCES/devtoolset-7-perftools-docker-1c51b64.tar.bz2
-SOURCES/devtoolset-7-toolchain-docker-7356c45.tar.bz2
diff --git a/SPECS/devtoolset-8.spec b/SPECS/devtoolset-8.spec
index 0b7a2fb..3778b42 100644
--- a/SPECS/devtoolset-8.spec
+++ b/SPECS/devtoolset-8.spec
@@ -1,33 +1,19 @@
 %global scl devtoolset-8
 %scl_package %scl
-%global df_toolchain 7356c45f3d7ed9e1def541d3d3ef6b1d51e92f29
-%global df_perftools 1c51b6475a2c0a59def0c4738b4f865979c00b3f
-%global df_toolchain_s %(c=%{df_toolchain}; echo ${c:0:7})
-%global df_perftools_s %(c=%{df_perftools}; echo ${c:0:7})
-%global dockerfiledir %{_datadir}/%{scl_prefix}dockerfiles
 
 Summary: Package that installs %scl
 Name: %scl_name
-Version: 8.0
-Release: 2%{?dist}
+Version: 8.1
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/File
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: README
-# The source for this package was pulled from upstream's git.  Use the
-# following commands to generate the tarball:
-# git clone git://pkgs.devel.redhat.com/rpms/devtoolset-7-toolchain-docker -b devtoolset-7.0-rhel-7
-# rm -rf devtoolset-7-toolchain-docker/.git{,ignore}
-# tar cf - devtoolset-7-toolchain-docker | bzip2 -9 > devtoolset-7-toolchain-docker-%%{df_toolchain_s}.tar.bz2
-# git clone git://pkgs.devel.redhat.com/rpms/devtoolset-7-perftools-docker -b devtoolset-7.0-rhel-7
-# rm -rf devtoolset-7-perftools-docker/.git{,ignore}
-# tar cf - devtoolset-7-perftools-docker | bzip2 -9 > devtoolset-7-perftools-docker-%%{df_perftools_s}.tar.bz2
-Source1: devtoolset-7-toolchain-docker-%{df_toolchain_s}.tar.bz2
-Source2: devtoolset-7-perftools-docker-%{df_perftools_s}.tar.bz2
 
 # The base package requires just the toolchain and the perftools.
 Requires: %{scl_prefix}toolchain %{scl_prefix}perftools
 Obsoletes: %{name} < %{version}-%{release}
+Obsoletes: %{scl_prefix}dockerfiles
 
 BuildRequires: scl-utils-build >= 20120927-11
 BuildRequires: iso-codes
@@ -88,17 +74,8 @@ Obsoletes: %{name}-perftools < %{version}-%{release}
 %description perftools
 Package shipping performance tools (systemtap, oprofile)
 
-%package dockerfiles
-Summary: Package shipping Dockerfiles for Developer Toolset
-Group: Applications/File
-
-%description dockerfiles
-This package provides a set of example Dockerfiles that can be used
-with Red Hat Developer Toolset.  Use these examples to stand up
-test environments using the Docker container engine.
-
 %prep
-%setup -c -T -a 1 -a 2
+%setup -c -T
 
 # This section generates README file from a template and creates man page
 # from that file, expanding RPM macros in the template file.
@@ -191,16 +168,6 @@ install -d -m 755 %{buildroot}%{_libdir}/perl5
 install -d -m 755 %{buildroot}%{_libdir}/perl5/vendor_perl
 install -d -m 755 %{buildroot}%{_libdir}/perl5/vendor_perl/auto
 
-%if 0%{?rhel} >= 7
-install -d %{buildroot}%{dockerfiledir}
-install -d -p -m 755 %{buildroot}%{dockerfiledir}/rhel7
-collections="devtoolset-7-toolchain-docker devtoolset-7-perftools-docker"
-for d in $collections; do
-  install -d -p -m 755 %{buildroot}%{dockerfiledir}/rhel7/$d
-  cp -a $d %{buildroot}%{dockerfiledir}/rhel7
-done
-%endif
-
 # Install generated man page.
 install -d -m 755 %{buildroot}%{_mandir}/man7
 install -p -m 644 %{?scl_name}.7 %{buildroot}%{_mandir}/man7/
@@ -222,11 +189,6 @@ install -p -m 644 %{?scl_name}.7 %{buildroot}%{_mandir}/man7/
 
 %files perftools
 
-%if 0%{?rhel} >= 7
-%files dockerfiles
-%{dockerfiledir}
-%endif
-
 %post runtime
 if [ ! -f %{_sysconfdir}/selinux-equiv.created ]; then
   /usr/sbin/semanage fcontext -a -e / %{_scl_root}
@@ -244,6 +206,13 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Wed Mar 20 2019 Marek Polacek <polacek@redhat.com> - 8.1.1
+- add Obsoletes devtoolset-8-dockerfiles (#1658648)
+
+* Wed Jan  9 2019 Marek Polacek <polacek@redhat.com> - 8.1.0
+- update to 8.1
+- remove -dockerfiles subpackage (#1658648)
+
 * Wed Jun 27 2018 Marek Polacek <polacek@redhat.com> - 8.0.2
 - add PKG_CONFIG_PATH