diff --git a/debian/changelog b/packages/debian/changelog
similarity index 100%
rename from debian/changelog
rename to packages/debian/changelog
diff --git a/debian/compat b/packages/debian/compat
similarity index 100%
rename from debian/compat
rename to packages/debian/compat
diff --git a/debian/control b/packages/debian/control
similarity index 100%
rename from debian/control
rename to packages/debian/control
diff --git a/debian/copyright b/packages/debian/copyright
similarity index 100%
rename from debian/copyright
rename to packages/debian/copyright
diff --git a/debian/rules b/packages/debian/rules
similarity index 100%
rename from debian/rules
rename to packages/debian/rules
diff --git a/debian/sanoid.README.Debian b/packages/debian/sanoid.README.Debian
similarity index 100%
rename from debian/sanoid.README.Debian
rename to packages/debian/sanoid.README.Debian
diff --git a/debian/sanoid.docs b/packages/debian/sanoid.docs
similarity index 100%
rename from debian/sanoid.docs
rename to packages/debian/sanoid.docs
diff --git a/debian/sanoid.service b/packages/debian/sanoid.service
similarity index 100%
rename from debian/sanoid.service
rename to packages/debian/sanoid.service
diff --git a/debian/sanoid.timer b/packages/debian/sanoid.timer
similarity index 100%
rename from debian/sanoid.timer
rename to packages/debian/sanoid.timer
diff --git a/debian/source/format b/packages/debian/source/format
similarity index 100%
rename from debian/source/format
rename to packages/debian/source/format
diff --git a/packages/rhel/sanoid-1.4.18.tar.gz b/packages/rhel/sanoid-1.4.18.tar.gz
new file mode 100644
index 0000000..df137cd
Binary files /dev/null and b/packages/rhel/sanoid-1.4.18.tar.gz differ
diff --git a/sanoid.spec b/packages/rhel/sanoid.spec
similarity index 92%
rename from sanoid.spec
rename to packages/rhel/sanoid.spec
index c0f33ed..ab299a5 100644
--- a/sanoid.spec
+++ b/packages/rhel/sanoid.spec
@@ -1,4 +1,4 @@
-%global version 1.4.14
+%global version 1.4.18
 %global git_tag v%{version}
 
 # Enable with systemctl "enable sanoid.timer"
@@ -6,13 +6,13 @@
 
 Name:		   sanoid
 Version:	   %{version}
-Release:	   2%{?dist}
+Release:	   1%{?dist}
 BuildArch:	   noarch
 Summary:	   A policy-driven snapshot management tool for ZFS file systems
 Group:		   Applications/System
 License:	   GPLv3
 URL:		   https://github.com/jimsalterjrs/sanoid
-Source0:       https://github.com/jimsalterjrs/%{name}/archive/%{git_tag}/%{name}-%{version}.tar.gz
+Source0:           https://github.com/jimsalterjrs/%{name}/archive/%{git_tag}/%{name}-%{version}.tar.gz
 
 Requires:	   perl, mbuffer, lzop, pv
 %if 0%{?_with_systemd}
@@ -110,6 +110,8 @@ echo "* * * * * root %{_sbindir}/sanoid --cron" > %{buildroot}%{_docdir}/%{name}
 %endif
 
 %changelog
+* Sat Apr 28 2018 Dominic Robinson <github@dcrdev.com> - 1.4.18-1
+- Bump to 1.4.18
 * Thu Aug 31 2017 Dominic Robinson <github@dcrdev.com> - 1.4.14-2
 - Add systemd timers
 * Wed Aug 30 2017 Dominic Robinson <github@dcrdev.com> - 1.4.14-1
@@ -121,6 +123,5 @@ echo "* * * * * root %{_sbindir}/sanoid --cron" > %{buildroot}%{_docdir}/%{name}
 - Version bump
 - Clean up variables and macros
 - Compatible with both Fedora and Red Hat
-
 * Sat Feb 13 2016 Thomas M. Lapp <tmlapp@gmail.com> - 1.4.4-1
 - Initial RPM Package
diff --git a/packages/rhel/sources b/packages/rhel/sources
new file mode 100644
index 0000000..d6068d4
--- /dev/null
+++ b/packages/rhel/sources
@@ -0,0 +1 @@
+cf0ec23c310d2f9416ebabe48f5edb73  sanoid-1.4.18.tar.gz