diff --git a/.gitignore b/.gitignore
index 8a6ffa5..36e05df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,91 +1,7 @@
-otp_src_R14A.tar.gz
-/otp_src_R14B.tar.gz
-/otp_doc_html_R14B.tar.gz
-/otp_doc_man_R14B.tar.gz
-/otp_doc_html_R14B01.tar.gz
-/otp_doc_man_R14B01.tar.gz
-/otp_src_R14B01.tar.gz
-/otp_doc_html_R14B02.tar.gz
-/otp_doc_man_R14B02.tar.gz
-/otp_src_R14B02.tar.gz
-/otp_src_R14B03.tar.gz
-/otp_doc_html_R14B03.tar.gz
-/otp_doc_man_R14B03.tar.gz
-/otp_src_R14B04.tar.gz
-/otp_doc_html_R14B04.tar.gz
-/otp_doc_man_R14B04.tar.gz
-/otp_doc_html_R15B.tar.gz
-/otp_doc_man_R15B.tar.gz
-/otp_src_R15B.tar.gz
-/otp_doc_html_R15B01.tar.gz
-/otp_doc_man_R15B01.tar.gz
-/otp_src_R15B01.tar.gz
-/otp_doc_html_R15B02.tar.gz
-/otp_doc_man_R15B02.tar.gz
-/otp_src_R15B02.tar.gz
-/otp_doc_html_R15B03-1.tar.gz
-/otp_doc_man_R15B03-1.tar.gz
-/otp_src_R15B03-1.readme
-/otp_src_R15B03-1.tar.gz
-/otp_doc_html_R16A_RELEASE_CANDIDATE.tar.gz
-/otp_doc_man_R16A_RELEASE_CANDIDATE.tar.gz
-/otp_src_R16A_RELEASE_CANDIDATE.tar.gz
-/otp_src_R16A_RELEASE_CANDIDATE.readme
-/otp_src_R16B.tar.gz
-/otp_doc_html_R16B.tar.gz
-/otp_doc_man_R16B.tar.gz
-/otp_src_R16B01.tar.gz
-/otp_doc_html_R16B01.tar.gz
-/otp_doc_man_R16B01.tar.gz
-/otp_src_R16B01.readme
-/otp_src_R16B02.tar.gz
-/otp_doc_html_R16B02.tar.gz
-/otp_doc_man_R16B02.tar.gz
-/otp_src_R16B02.readme
-/otp_src_R16B03.tar.gz
-/otp_doc_html_R16B03.tar.gz
-/otp_doc_man_R16B03.tar.gz
-/otp_src_R16B03.readme
-/otp_src_R16B03-1.readme
-/otp_doc_html_R16B03-1.tar.gz
-/otp_doc_man_R16B03-1.tar.gz
-/otp_src_R16B03-1.tar.gz
-/otp-OTP-17.2.1.tar.gz
-/otp-OTP-17.2.2.tar.gz
-/otp-OTP-17.3.3.tar.gz
-/otp-OTP-17.3.4.tar.gz
-/otp-OTP-17.4.tar.gz
-/otp-OTP-18.2.2.tar.gz
-/otp-OTP-18.2.3.tar.gz
-/otp-OTP-18.2.4.tar.gz
-/otp-OTP-18.3.tar.gz
-/otp-OTP-18.3.1.tar.gz
-/otp-OTP-18.3.2.tar.gz
-/otp-OTP-18.3.3.tar.gz
-/otp-OTP-18.3.4.tar.gz
-/otp-OTP-18.3.4.1.tar.gz
-/otp-OTP-18.3.4.2.tar.gz
-/otp-OTP-19.0.2.tar.gz
-/otp-OTP-19.0.4.tar.gz
-/otp-OTP-19.0.5.tar.gz
-/otp-OTP-19.0.6.tar.gz
-/otp-OTP-19.0.7.tar.gz
-/otp-OTP-19.1.1.tar.gz
-/otp-OTP-19.1.2.tar.gz
-/otp-OTP-19.1.3.tar.gz
-/otp-OTP-19.1.4.tar.gz
-/otp-OTP-19.1.5.tar.gz
-/otp-OTP-19.1.6.tar.gz
-/otp-OTP-19.2.tar.gz
-/otp-OTP-19.2.1.tar.gz
-/otp-OTP-19.2.2.tar.gz
-/otp-OTP-19.2.3.tar.gz
-/otp-OTP-19.3.tar.gz
-/otp-OTP-19.3.1.tar.gz
-/otp-OTP-19.3.2.tar.gz
-/otp-OTP-19.3.3.tar.gz
-/otp-OTP-19.3.4.tar.gz
-/otp-OTP-19.3.5.tar.gz
-/otp-OTP-19.3.6.tar.gz
-/otp-OTP-19.3.6.1.tar.gz
-/otp-OTP-19.3.6.2.tar.gz
+/*.src.rpm
+/*~
+/otp-OTP-*.tar.gz
+/otp_doc_html_R*.tar.gz
+/otp_doc_man_R*.tar.gz
+/otp_src_R*.readme
+/otp_src_R*.tar.gz
diff --git a/erlang.spec b/erlang.spec
index efe2026..27fbd72 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -65,8 +65,8 @@
 
 
 Name:		erlang
-Version:	19.3.6.2
-Release:	2%{?dist}
+Version:	19.3.6.3
+Release:	1%{?dist}
 Summary:	General-purpose programming language and runtime environment
 
 Group:		Development/Languages
@@ -98,32 +98,14 @@ Source999:	otp-get-patches.sh
 # for some semi-automatic patch update assistance.
 #
 # start of autogenerated patch tag list
-# Fedora specific patch
-#   Do not format man-pages and do not install miscellaneous
 Patch1: otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
-# Fedora specific patch
-#   Remove rpath
 Patch2: otp-0002-Remove-rpath.patch
-# Fedora specific patch
-#   Do not install C sources
 Patch3: otp-0003-Do-not-install-C-sources.patch
-# Fedora specific patch
-#   Do not install Java sources
 Patch4: otp-0004-Do-not-install-Java-sources.patch
-# Fedora specific patch
-#   Do not install nteventlog and related doc-files on non-win32
 Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
-# Fedora specific patch
-#   Do not install erlang sources
 Patch6: otp-0006-Do-not-install-erlang-sources.patch
-# Fedora specific patch
-#   Fix CVE-2016-10253
 Patch7: otp-0007-Fix-CVE-2016-10253.patch
-# Fedora specific patch
-#   Fix erl_epmd:port_please when using IPv6
 Patch8: otp-0008-Fix-erl_epmd-port_please-when-using-IPv6.patch
-# Fedora specific patch
-#   Add extra search directory
 Patch9: otp-0009-Add-extra-search-directory.patch
 # end of autogenerated patch tag list
 
@@ -928,19 +910,7 @@ Provides support for XML 1.0.
 ### END OF AUTOGENERATED LIST ###
 
 %prep
-%setup -q -n otp-OTP-%{version}
-
-# start of autogenerated prep patch list
-%patch1 -p1 -b .Do_not_format_man_pages_and_do_not_install_miscellan
-%patch2 -p1 -b .Remove_rpath
-%patch3 -p1 -b .Do_not_install_C_sources
-%patch4 -p1 -b .Do_not_install_Java_sources
-%patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n
-%patch6 -p1 -b .Do_not_install_erlang_sources
-%patch7 -p1 -b .Fix_CVE_2016_10253
-%patch8 -p1 -b .Fix_erl_epmd_port_please_when_using_IPv6
-%patch9 -p1 -b .Add_extra_search_directory
-# end of autogenerated prep patch list
+%autosetup -n otp-OTP-%{version}
 
 # FIXME we should come up with a better solution
 # remove shipped zlib sources
diff --git a/otp-get-patches.sh b/otp-get-patches.sh
index 033db0e..75d4a54 100755
--- a/otp-get-patches.sh
+++ b/otp-get-patches.sh
@@ -17,18 +17,6 @@
 #
 # # start of autogenerated patch tag list
 # # end of autogenerated patch tag list
-# # start of autogenerated prep patch list
-# # end of autogenerated prep patch list
-#
-# The following special comment lines in the git commit messages
-# will be interpreted:
-#
-#    Fedora-Spec-Comment: This patch only applies to EL6 builds
-#    Fedora-Spec-Before: %if 0%?el6}
-#    Fedora-Spec-After: %endif
-#
-# If there is no "Fedora-Spec-Comment:" line, we will use
-# "Fedora specific patch".
 
 # Command line parsing
 otp_dir="${1:?'Fatal: otp git repo dir required'}"
@@ -49,44 +37,29 @@ test -s "$tmpdir/patch-list.txt"
 
 # Process patch files
 echo "# start of autogenerated patch tag list" > "$tmpdir/patch-list-tags.txt"
-echo "# start of autogenerated prep patch list" > "$tmpdir/patch-list-prep.txt"
 n=1
 while read patch
 do
 	otppatch="$(dirname "$patch")/otp-$(basename "$patch")"
 	${SED-sed} -e '1d' -e '/^-- $/,$d' "$patch" > "$otppatch"
 	rm -f "$patch"
-	comment="$(sed -n 's/^Fedora-Spec-Comment:\s*//p' "$otppatch")"
-	if test "x$comment" = "x"; then comment="Fedora specific patch"; fi
-	echo "# ${comment}" >> "$tmpdir/patch-list-tags.txt"
-	echo "#   $(sed -n 's/^Subject: \[PATCH\] //p' "$otppatch")" >> "$tmpdir/patch-list-tags.txt"
 	echo "Patch$n: $(basename "$otppatch")" >> "$tmpdir/patch-list-tags.txt"
-	base="$(basename "$patch" ".patch" | sed 's/^00[0-9][0-9]-//')"
-	backupext=".$(echo -n "$base" | tr -c -s '[:alnum:]' '_')"
-	sed -n 's/^Fedora-Spec-Before:\s*//p' "$otppatch" >> "$tmpdir/patch-list-prep.txt"
-	echo "%patch$n -p1 -b ${backupext}" >> "$tmpdir/patch-list-prep.txt"
-	sed -n 's/^Fedora-Spec-After:\s*//p' "$otppatch" >> "$tmpdir/patch-list-prep.txt"
 	n=$(($n + 1))
 done < "$tmpdir/patch-list.txt"
 echo "# end of autogenerated patch tag list" >> "$tmpdir/patch-list-tags.txt"
-echo "# end of autogenerated prep patch list" >> "$tmpdir/patch-list-prep.txt"
 
 # Create updated spec file
 specfile="erlang.spec"
 newspec1="${tmpdir}/${specfile}.new1"
-newspec2="${tmpdir}/${specfile}.new2"
 sed '/^# start of autogenerated patch tag list$/,$d' "$specfile" > "$newspec1"
 cat "$tmpdir/patch-list-tags.txt" >> "$newspec1"
 sed '1,/^# end of autogenerated patch tag list/d' "$specfile" >> "$newspec1"
-sed '/^# start of autogenerated prep patch list$/,$d' "$newspec1" > "$newspec2"
-cat "$tmpdir/patch-list-prep.txt" >> "$newspec2"
-sed '1,/^# end of autogenerated prep patch list/d' "$newspec1" >> "$newspec2"
 
 # Actually put all changes into git index
 git rm -f otp-00*.patch
 mv "$tmpdir/otp-00"*.patch .
 git add otp-00*.patch
-mv -f "$newspec2" "$specfile"
+mv -f "$newspec1" "$specfile"
 git add "$specfile"
 
 rm -rf "$tmpdir"
diff --git a/sources b/sources
index 5255c77..5b53573 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (otp-OTP-19.3.6.2.tar.gz) = 195cff90ef13761b03c311eadd238907dbc4b9c3ddff19c0356ead33f55113d535b15f250d06b32cbcdff6e34dfc8c3677f9e7d021b355defae74ae49f672ed0
+SHA512 (otp-OTP-19.3.6.3.tar.gz) = 9260dbc2dfff82c80697ec2a00452cb33411d895c66a8e6993fdf5a10cabbb8d52e5dc1755220584186c419ea179fd6380a13b89bbedcbdbdf766c2ac41d55f2