diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dafa321
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/*.tar.*
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 6f602c5..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: gkrellm
-# $Id$
-NAME := gkrellm
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/gkrellm-2.4.0-config.patch b/gkrellm-2.4.0-config.patch
new file mode 100644
index 0000000..4d85e99
--- /dev/null
+++ b/gkrellm-2.4.0-config.patch
@@ -0,0 +1,25 @@
+diff -up gkrellm-2.3.5/server/gkrellmd.conf.config gkrellm-2.3.5/server/gkrellmd.conf
+--- gkrellm-2.3.5/server/gkrellmd.conf.config	2010-09-14 17:26:19.000000000 +0300
++++ gkrellm-2.3.5/server/gkrellmd.conf	2011-06-19 19:17:56.398591498 +0300
+@@ -22,16 +22,17 @@
+ # List of hosts allowed to connect.  If no hosts are specified in a
+ # gkrellmd.conf file or on the command line, all hosts will be allowed.
+ #
+-#allow-host	localhost
+-#allow-host	127.0.0.1
++allow-host	localhost
++allow-host	127.0.0.1
++allow-host	::ffff:127.0.0.1
+ #allow-host	::1
+ #allow-host	192.168.0.*
+ 
+ # Drop privileges after startup (you must start gkrellmd as root to do it).
+ # NOTE: Option ignored on Windows
+ #
+-#user	nobody
+-#group	proc
++user	gkrellmd
++group	gkrellmd
+ 
+ # Create a PID file for the running gkrellmd.  Default is no PID file.
+ # NOTE: Option ignored on Windows
diff --git a/gkrellm-2.4.0-width.patch b/gkrellm-2.4.0-width.patch
new file mode 100644
index 0000000..3140f13
--- /dev/null
+++ b/gkrellm-2.4.0-width.patch
@@ -0,0 +1,11 @@
+--- gkrellm-2.2.7/src/gkrellm.h.width	2005-06-09 12:48:34.000000000 +0200
++++ gkrellm-2.2.7/src/gkrellm.h	2005-06-09 12:48:37.000000000 +0200
+@@ -518,7 +518,7 @@
+ 	GkrellmPanel;
+ 
+ 
+-#define CHART_WIDTH_MAX	1000
++#define CHART_WIDTH_MAX	1600
+ #define CHART_WIDTH_MIN	25
+ 
+   /* Each chart must have a GkrellmChartconfig struct associated with it.
diff --git a/gkrellm.spec b/gkrellm.spec
new file mode 100644
index 0000000..26746cf
--- /dev/null
+++ b/gkrellm.spec
@@ -0,0 +1,134 @@
+Name:           gkrellm
+Version:        2.4.0
+Release:        %autorelease
+Summary:        Multiple stacked system monitors in one process
+License:        GPL-3.0-or-later
+URL:            https://gkrellm.srcbox.net/
+Source0:        https://gkrellm.srcbox.net/releases/%{name}-%{version}.tar.bz2
+Source5:        make-git-snapshot.sh
+Patch1:         gkrellm-2.4.0-config.patch
+Patch3:         gkrellm-2.4.0-width.patch
+BuildRequires:  gcc
+BuildRequires:  gtk2-devel openssl-devel libSM-devel desktop-file-utils gettext
+BuildRequires:  lm_sensors-devel libntlm-devel libappstream-glib
+Requires:       gdk-pixbuf2-modules-extra%{?_isa}
+
+%description
+GKrellM charts CPU, load, Disk, and all active net interfaces
+automatically.  An on/off button and online timer for the PPP
+interface is provided, as well as monitors for memory and swap usage,
+file system, internet connections, APM laptop battery, mbox style
+mailboxes, and temperature sensors on supported systems.  Also
+included is an uptime monitor, a hostname label, and a clock/calendar.
+Additional features are:
+
+  * Autoscaling grid lines with configurable grid line resolution.
+  * LED indicators for the net interfaces.
+  * A gui popup for configuration of chart sizes and resolutions.
+
+
+%package daemon
+Summary:        The GNU Krell Monitors Server
+# systemd >= 186 for scriptlet macros
+BuildRequires:  systemd >= 186
+BuildRequires: make
+Requires(pre):  systemd
+Requires(post,preun,postun): systemd
+
+
+%description daemon
+gkrellmd listens for connections from gkrellm clients. When a gkrellm
+client connects to a gkrellmd server all builtin monitors collect their
+data from the server.
+
+
+%package        devel
+Summary:        Development files for the GNU Krell Monitors
+Requires:       gtk2-devel%{?_isa}
+
+%description devel
+Development files for the GNU Krell Monitors.
+
+
+%prep
+%autosetup -p1
+
+for i in gkrellmd.1 gkrellm.1 README Changelog.OLD Changelog-plugins.html \
+    src/gkrellm.h server/gkrellmd.h; do
+   sed -i -e "s@/usr/lib/gkrellm2*/plugins@%{_libdir}/gkrellm2/plugins@" $i
+   sed -i -e "s@/usr/local/lib/gkrellm2*/plugins@/usr/local/%{_lib}/gkrellm2/plugins@" $i
+done
+
+# Create a sysusers.d config file
+cat >gkrellm.sysusers.conf <<EOF
+u gkrellmd - 'GNU Krell daemon' - -
+EOF
+
+
+%build
+make %{?_smp_mflags} PREFIX=%{_prefix} \
+    PKGCONFIGDIR=%{_libdir}/pkgconfig \
+    INCLUDEDIR=%{_includedir} \
+    SINSTALLDIR=%{_sbindir} \
+    CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -Wno-error=incompatible-pointer-types" \
+    LDFLAGS="$RPM_LD_FLAGS"
+
+
+%install
+mkdir -p %{buildroot}%{_datadir}/gkrellm2/themes
+mkdir -p %{buildroot}%{_libdir}/gkrellm2/plugins
+
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} \
+    LOCALEDIR=%{buildroot}%{_datadir}/locale \
+    INSTALLDIR=%{buildroot}%{_bindir} \
+    SINSTALLDIR=%{buildroot}%{_sbindir} \
+    MANDIR=%{buildroot}%{_mandir}/man1 \
+    PKGCONFIGDIR=%{buildroot}%{_libdir}/pkgconfig \
+    INCLUDEDIR=%{buildroot}%{_includedir} \
+    CFGDIR=%{buildroot}%{_sysconfdir}
+%find_lang %name
+
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
+
+install -m0644 -D gkrellm.sysusers.conf %{buildroot}%{_sysusersdir}/gkrellm.conf
+
+
+
+%post daemon
+%systemd_post gkrellmd.service
+
+%preun daemon
+%systemd_preun gkrellmd.service
+
+%postun daemon
+%systemd_postun_with_restart gkrellmd.service
+
+
+%files -f %{name}.lang
+%license COPYRIGHT
+%doc CHANGELOG.md Changelog.OLD README Themes.html
+%{_bindir}/%{name}
+%{_libdir}/gkrellm2
+%{_datadir}/gkrellm2
+%{_mandir}/man1/%{name}.1*
+%{_metainfodir}/*.metainfo.xml
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+
+%files devel
+%license %{_licensedir}/%{name}*
+%{_includedir}/gkrellm2
+%{_libdir}/pkgconfig/%{name}.pc
+
+%files daemon
+%license %{_licensedir}/%{name}*
+%{_unitdir}/gkrellmd.service
+%{_sbindir}/gkrellmd
+%{_mandir}/man1/gkrellmd.*
+%config(noreplace) %{_sysconfdir}/gkrellmd.conf
+%{_sysusersdir}/gkrellm.conf
+
+
+%changelog
+%autochangelog
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
new file mode 100755
index 0000000..44cd4a0
--- /dev/null
+++ b/make-git-snapshot.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Usage: ./make-git-snapshot.sh [COMMIT]
+#
+# to make a snapshot of the given tag/branch.  Defaults to HEAD.
+# Point env var REF to a local git repo to reduce clone time.
+
+DIRNAME=gkrellm-$( date +%Y%m%d )
+
+echo REF ${REF:+--reference $REF}
+echo DIRNAME $DIRNAME
+echo HEAD ${1:-HEAD}
+
+rm -rf $DIRNAME
+
+git clone ${REF:+--reference $REF} \
+	git://git.srcbox.net/gkrellm $DIRNAME
+
+GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
+	| bzip2 > $DIRNAME.tar.bz2
+
+# rm -rf $DIRNAME
diff --git a/sources b/sources
index e69de29..9513bac 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (gkrellm-2.4.0.tar.bz2) = 770acfe5ee23b74ffe5becc89d3735e9e8688ac338b052e1c2f86cb722b7867b1f8c262a969ef3140eb32912cf0426ac13bf3743e2a9149eec2a962655e05a9f