diff --git a/ChangeLog b/ChangeLog
index f0bdb3a7..2006fb09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2396,3 +2396,13 @@ Sun Jan 25 09:57:33 CET 2004
 
 Fixups after recent changes.
 Focus code name space cleanup.
+
+-------------------------------------------------------------------------------
+
+Sun Feb  1 17:54:40 CET 2004
+(Kim)
+
+Shuffled around some focus and event handling code.
+Attempted to fix some focus problems.
+Fixed error in placement of initially shaded windows.
+Included ENLIGHTENMENT_RELEASE in version string.
diff --git a/configure.in b/configure.in
index 3ce61c67..315fc37e 100644
--- a/configure.in
+++ b/configure.in
@@ -26,6 +26,9 @@ AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MINOR, "$ENLIGHTENMENT_MINOR", [Minor Version])
 AC_SUBST(ENLIGHTENMENT_MINOR)
 AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO", [Micro Version])
 AC_SUBST(ENLIGHTENMENT_MICRO)
+if test "x$ENLIGHTENMENT_RELEASE" != "x"; then
+AC_DEFINE_UNQUOTED(ENLIGHTENMENT_RELEASE, "$ENLIGHTENMENT_RELEASE", [Release])
+fi
 
 AC_SUBST(ENLIGHTENMENT_ROOT)
 AC_SUBST(ENLIGHTENMENT_BIN)
diff --git a/e.spec b/e.spec
index 7db87c1f..dafb1e14 100644
--- a/e.spec
+++ b/e.spec
@@ -1,15 +1,20 @@
-Summary: The Enlightenment window manager.
-Name: enlightenment
-Version: 0.16.7
-Release: 0.21
-Copyright: BSD
-Group: User Interface/Desktops
-Source: ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment-%{version}.tar.gz
-Prefix: %{_prefix}
-Docdir: %{_docdir}
-BuildRoot: /tmp/e-%{version}-root
-Packager: Michael Jennings <mej@eterm.org>
-URL: http://www.enlightenment.org/
+%define name	enlightenment
+%define version 0.16.7
+%define release 0.22
+
+Summary:	The Enlightenment window manager.
+Name:		%{name}
+Version:	%{version}
+Release:	%{release}
+Copyright:	BSD
+Group:		User Interface/Desktops
+Source:		ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment-%{version}.tar.gz
+Prefix:		%{_prefix}
+Docdir:		%{_docdir}
+BuildRoot:	/tmp/e-%{version}-root
+Packager:	Michael Jennings <mej@eterm.org>
+URL:		http://www.enlightenment.org/
+
 Requires: imlib2
 Requires: esound >= 0.2.13
 
@@ -33,7 +38,8 @@ This package will install the Enlightenment window manager.
 
 %build
 CFLAGS="${RPM_OPT_FLAGS}"
-export CFLAGS
+ENLIGHTENMENT_RELEASE=%{release}
+export CFLAGS ENLIGHTENMENT_RELEASE
 if [ ! -f configure ]; then
   ./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --datadir=%{_datadir} --mandir=%{_mandir} --enable-fsstd --enable-upgrade=no --enable-hints-gnome
 else