diff --git a/debian-upstream/control b/debian-upstream/control
index 527d39882..ea890cf5b 100644
--- a/debian-upstream/control
+++ b/debian-upstream/control
@@ -6,7 +6,7 @@ Homepage: https://mkvtoolnix.download/
 Standards-Version: 3.9.5
 Build-Depends:
  debhelper (>= 9),
- ruby (>= 1.9) | ruby1.9 | ruby1.9.1 | ruby1.9.3,
+ rake (>= 10),
  libbz2-dev, liblzo2-dev, zlib1g-dev, libmagic-dev,
  libflac-dev, libogg-dev, libvorbis-dev,
  libboost-dev (>= 1.46), libboost-filesystem-dev (>= 1.46),
diff --git a/debian-upstream/rules b/debian-upstream/rules
index 153445b52..8f2608798 100755
--- a/debian-upstream/rules
+++ b/debian-upstream/rules
@@ -12,7 +12,7 @@ LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 	dh $@ --parallel
 
 override_dh_clean:
-	[ ! -f build-config ] || ./drake clean:dist
+	[ ! -f build-config ] || rake clean:dist
 
 	dh_clean src/mkvinfo-gui config.status config.log \
 	rake.d/dependecy.d/*.rb src/input/*.d config.h build-config
@@ -22,7 +22,7 @@ override_dh_auto_configure:
 	  --enable-debug --enable-optimization
 
 override_dh_auto_build:
-	./drake
+	rake
 
 	mv src/mkvinfo src/mkvinfo-gui
 	rm src/info/*.o src/info/*.a src/info/qt_resources.cpp
@@ -33,12 +33,12 @@ override_dh_auto_build:
 	touch -r config.h.ref config.h
 	rm config.h.ref
 
-	./drake apps:mkvinfo USE_QT=no QT_LIBS=' ' QT_INCLUDES=' '
+	rake apps:mkvinfo USE_QT=no QT_LIBS=' ' QT_INCLUDES=' '
 
 	touch src/info/qt_ui.o src/info/qt_resources.cpp src/info/qt_resources.o src/info/libmtxinfo.a src/mkvinfo
 
 override_dh_install:
-	./drake install DESTDIR=$(CURDIR)/debian/tmp
+	rake install DESTDIR=$(CURDIR)/debian/tmp
 
 	dh_install --list-missing -Xmkvtoolnix.xml
 
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index ec5642864..20ce696e3 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -9,35 +9,32 @@ Release: 1
 Summary: Tools to create, alter and inspect Matroska files
 Source: %{name}-%{version}.tar.xz
 
-BuildRequires: fdupes, file-devel, flac, flac-devel, libogg-devel, libstdc++-devel, libvorbis-devel, make, pkgconfig, zlib-devel
+BuildRequires: fdupes, file-devel, flac, flac-devel, libogg-devel, libstdc++-devel, libvorbis-devel, make, pkgconfig, zlib-devel, boost-devel >= 1.46.0
 
-%if 0%{?centos} && 0%{?centos} < 7
-BuildRequires: devtoolset-1.1-gcc-c++ >= 4.6.3
+%if 0%{?centos}
+BuildRequires: devtoolset-4-gcc-c++ >= 5.0.0, rubygem-drake
+%endif
+
+%if 0%{?suse_version}
+BuildRequires: gettext-tools libqt5-qtbase-devel, ruby2.1-rubygem-rake
 %else
-BuildRequires: boost-devel >= 1.46.0, ruby >= 1.9
+BuildRequires: gettext-devel, qt5-qtbase-devel
 %endif
 
 %if 0%{?suse_version}
 BuildRequires: gcc5-c++
-%else
-BuildRequires: gcc-c++ >= 4.6.3
+%endif
+
+%if 0%{?fedora}
+BuildRequires: gcc-c++ >= 4.9.0, rubypick, pugixml-devel, rubygem-rake
 %endif
 
 %if 0%{?suse_version}
 Group: Productivity/Multimedia/Other
 License: GPL-2.0
-BuildRequires: gettext-tools libqt5-qtbase-devel
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} || 0%{?centos}
+%else
 Group: Applications/Multimedia
 License: GPLv2
-BuildRequires: qt5-qtbase-devel, gettext-devel
-
-%if 0%{?fedora}
-BuildRequires: rubypick, pugixml-devel
-%endif
-
 %endif
 
 %description
@@ -55,6 +52,11 @@ Authors:
 
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
+%if 0%{?centos}
+BUILD_TOOL=drake
+%else
+BUILD_TOOL=rake
+%endif
 
 %if 0%{?centos}
 export CC=/opt/rh/devtoolset-4/root/bin/gcc
@@ -69,10 +71,18 @@ export CXX=/usr/bin/g++-5
 %configure --enable-debug --enable-optimization
 
 %build
-./drake
+%if 0%{?centos}
+drake
+%else
+rake
+%endif
 
 %install
-./drake DESTDIR=$RPM_BUILD_ROOT install
+%if 0%{?centos}
+drake DESTDIR=$RPM_BUILD_ROOT install
+%else
+rake DESTDIR=$RPM_BUILD_ROOT install
+%endif
 %if 0%{?suse_version}
 strip ${RPM_BUILD_ROOT}/usr/bin/*
 %endif