diff --git a/.gitmodules b/.gitmodules
index 665da11..da396b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "selinux"]
 	path = selinux
 	url = https://github.com/SELinuxProject/selinux
+[submodule "upstream"]
+	path = upstream
+	url = https://github.com/SELinuxProject/selinux/
diff --git a/rpm/selinux-userland.spec b/rpm/policycoreutils.spec
similarity index 99%
rename from rpm/selinux-userland.spec
rename to rpm/policycoreutils.spec
index 015bec2..ea3c5d5 100644
--- a/rpm/selinux-userland.spec
+++ b/rpm/policycoreutils.spec
@@ -1,3 +1,25 @@
+# based on work by The Fedora Project (2017)
+# Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 %global libauditver     2.1.3-4
 %global libsepolver     2.7-3
 %global libsemanagever  2.7-5
diff --git a/selinux b/selinux
deleted file mode 160000
index 1bac758..0000000
--- a/selinux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1bac758bf6cf884c112b80545d5fc5b668fc7d71
diff --git a/upstream b/upstream
new file mode 160000
index 0000000..f281fc5
--- /dev/null
+++ b/upstream
@@ -0,0 +1 @@
+Subproject commit f281fc52197300cc579ddb970b995cedc98878ab