diff --git a/kdeutils.spec b/kdeutils.spec
index ff4dcbb..0a0a44e 100644
--- a/kdeutils.spec
+++ b/kdeutils.spec
@@ -2,10 +2,15 @@
 # include new PyKDE4 printer applet
 %define printer_applet 1
 
+%if 0%{?fedora} == 9
+# continue including kjots here (as in 4.0) for F9 (we don't have kdepim 4.1 there)
+%define include_kjots 1
+%endif
+
 Name:           kdeutils
 Epoch:          6
 Version:        4.0.99
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -13,6 +18,10 @@ Group:          Applications/System
 License:        GPLv2
 URL:            http://www.kde.org
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+%if 0%{?include_kjots}
+Source1:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepim-%{version}.tar.bz2
+Patch0:         kdeutils-4.0.99-kjots-without-kdepim.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
@@ -59,6 +68,9 @@ Includes:
   * kdf (view disk usage)
   * kfloppy (floppy formatting tool)
   * kgpg (gpg gui)
+%if 0%{?include_kjots}
+  * kjots (note taker)
+%endif
   * ktimer (task scheduler)
   * kwalletmanager (kde wallet management Tool)
   * kwikdisk (removable media utility)
@@ -83,6 +95,18 @@ Requires: kdelibs4-devel kdepimlibs4-devel kdebase-workspace-devel
 
 %prep
 %setup -q
+%if 0%{?include_kjots}
+# unpack kdepim
+%setup -q -T -D -a 1
+# extract kjots
+mv -f kdepim-%{version}/kjots .
+# extract kjots documentation
+mv -f kdepim-%{version}/doc/kjots doc
+# get rid of the rest of kdepim
+rm -rf kdepim-%{version}
+# make kjots build with kdeutils
+%patch0 -p1 -b .kjots
+%endif
 
 %build
 
@@ -163,6 +187,10 @@ rm -rf %{buildroot}
 %{_kde4_configdir}/*
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kde4/*
+%if 0%{?include_kjots}
+%{_kde4_appsdir}/kjots/
+%{_kde4_docdir}/HTML/en/kjots/
+%endif
 
 %if 0
 %files libs
@@ -180,6 +208,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 21 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.0.99-1.1
+- reinclude kjots on F9 (moved to kdepim in 4.1, we don't ship kdepim 4 in F9)
+
 * Fri Jul 18 2008 Rex Dieter <rdieter@fedoraproject.org> 4.0.99-1
 - 4.0.99