diff --git a/Makefile b/Makefile
index f6f787f..1e6116e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,9 @@ install:
 	# KDM theme
 	mkdir -p $(DESTDIR)/etc/default/kdm.d
 	$(INSTALL) kdm-theme/kdm.d/10_desktop-base $(DESTDIR)/etc/default/kdm.d
+
+	mkdir -p $(DESTDIR)/usr/share/apps/kdm/themes/spacefun
+	$(INSTALL) $(wildcard kdm-theme/spacefun/*) $(DESTDIR)/usr/share/apps/kdm/themes/spacefun
 	mkdir -p $(DESTDIR)/usr/share/apps/kdm/themes/debian-moreblue
 	$(INSTALL) $(wildcard kdm-theme/debian-moreblue/*) $(DESTDIR)/usr/share/apps/kdm/themes/debian-moreblue
 	mkdir -p $(DESTDIR)/usr/share/apps/kdm/themes/moreblue-orbit
diff --git a/debian/changelog b/debian/changelog
index a8ae59e..c559622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,14 +7,18 @@ desktop-base (6.0.0~) UNRELEASED; urgency=low
     - add SpaceFun wallpaper
     - add SpaceFun grub theme.
   * slashy:
-    - add SpaceFun theme
+    - add SpaceFun theme.
+  * kdm-theme:
+    - add SpaceFun theme.
+    - configure SpaceFun as the default theme.
   * debian/postinst:
     - add SpaceFun alternative at maximum level (default Squeeze theme)
   * Makefile: 
     - drop unused rules for KDE3 and Xfce 4.4.
-    - add gdm3 theme.
+    - add SpaceFun gdm3 theme.
+    - add SpaceFun kdm theme. 
 
- -- Yves-Alexis Perez <corsac@debian.org>  Sat, 13 Nov 2010 21:27:59 +0100
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 14 Nov 2010 00:06:09 +0100
 
 desktop-base (5.0.6) unstable; urgency=low
 
diff --git a/kdm-theme/kdm.d/10_desktop-base b/kdm-theme/kdm.d/10_desktop-base
index 3346d91..35666f7 100644
--- a/kdm-theme/kdm.d/10_desktop-base
+++ b/kdm-theme/kdm.d/10_desktop-base
@@ -1,3 +1,3 @@
 USETHEME="true"
-THEME="/usr/share/apps/kdm/themes/moreblue-orbit"
-WALLPAPER="/usr/share/apps/kdm/themes/moreblue-orbit/background.png"
+THEME="/usr/share/apps/kdm/themes/spacefun"
+WALLPAPER="/usr/share/apps/kdm/themes/spacefun/background.png"
diff --git a/kdm-theme/spacefun/KdmGreeterTheme.desktop b/kdm-theme/spacefun/KdmGreeterTheme.desktop
new file mode 100644
index 0000000..e0dc186
--- /dev/null
+++ b/kdm-theme/spacefun/KdmGreeterTheme.desktop
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=spacefun.xml
+Name=SpaceFun
+Description=SpaceFun KDM Theme
+Author=Yves-Alexis Perez, based on GDM theme
+Copyright=(c) 2010 Yves-Alexis Perez <corsac@debian.org>
+Screenshot=screenshot.png
diff --git a/kdm-theme/spacefun/background.png b/kdm-theme/spacefun/background.png
new file mode 100644
index 0000000..7e67164
Binary files /dev/null and b/kdm-theme/spacefun/background.png differ
diff --git a/kdm-theme/spacefun/boundingbox.png b/kdm-theme/spacefun/boundingbox.png
new file mode 100644
index 0000000..a09afa1
Binary files /dev/null and b/kdm-theme/spacefun/boundingbox.png differ
diff --git a/kdm-theme/spacefun/icon-reboot.png b/kdm-theme/spacefun/icon-reboot.png
new file mode 100644
index 0000000..6373e01
Binary files /dev/null and b/kdm-theme/spacefun/icon-reboot.png differ
diff --git a/kdm-theme/spacefun/icon-session.png b/kdm-theme/spacefun/icon-session.png
new file mode 100644
index 0000000..ac7843c
Binary files /dev/null and b/kdm-theme/spacefun/icon-session.png differ
diff --git a/kdm-theme/spacefun/screenshot.png b/kdm-theme/spacefun/screenshot.png
new file mode 100644
index 0000000..ade1448
Binary files /dev/null and b/kdm-theme/spacefun/screenshot.png differ
diff --git a/kdm-theme/spacefun/spacefun.xml b/kdm-theme/spacefun/spacefun.xml
new file mode 100644
index 0000000..2d1234b
--- /dev/null
+++ b/kdm-theme/spacefun/spacefun.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+
+<!-- main pic, login pic -->
+<item type="pixmap">
+	<normal file="background.png"/>
+	<pos x="0" y="0" width="100%" height="100%"/>
+
+	<fixed>
+	<item type="pixmap">
+		<normal file="boundingbox.png"/>
+		<pos anchor="c" x="50%" y="50%" width="400" height="282"/>
+
+		<!-- Welcome -->
+		<fixed>
+		<item type="label">
+			<pos anchor="nc" x="50%" y="18%"/>
+			<normal color="#000000" font="Sans Bold 18"/>
+			<stock type="welcome-label"/>
+		</item>
+		</fixed>
+
+		<fixed>
+		<item type="rect">
+			<normal color="#ffff00" alpha="0.0"/>
+			<pos anchor="e" x="50%" y="50%" width="190" height="180"/>
+
+			<!-- username-label -->
+			<fixed>
+			<item type="label">
+				<pos anchor="ne" x="90%" y="40%"/>
+				<normal color="#000000" font="Sans Bold 10"/>
+				<stock type="username-label"/>
+			</item>
+			</fixed>
+
+			<!-- password-label -->
+			<fixed>
+			<item type="label">
+				<pos anchor="ne" x="90%" y="60%"/>
+				<normal color="#000000" font="Sans Bold 10"/>
+				<stock type="password-label"/>
+			</item>
+			</fixed>
+		</item>
+		</fixed>
+
+		<fixed>
+		<item type="rect">
+			<normal color="#00ffff" alpha="0.0"/>
+			<pos anchor="w" x="50%" y="50%" width="190" height="180"/>
+
+			<!-- username-entry -->
+			<fixed>
+			<item type="entry" id="user-entry">
+				<pos anchor="n" x="30%" y="35%" height="25" width="150"/>
+			</item>
+			</fixed>
+
+			<!-- password-entry -->
+			<fixed>
+			<item type="entry" id="pw-entry">
+				<pos anchor="n" x="30%" y="55%" height="25" width="150"/>
+			</item>
+			</fixed>
+		</item>
+		</fixed>
+	</item>
+	</fixed>
+
+	<!-- capslock-warning -->
+	<fixed>
+	<item type="rect" id="caps-lock-warning">
+		<pos anchor="c" x="50%" y="50%" width="box" height="box"/>
+		<box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+			<item type="label">
+				<normal color="#000000" font="Sans 12"/>
+				<pos anchor="n" x="50%" y="90"/>
+				<stock type="caps-lock-warning"/>
+			</item>
+		</box>
+	</item>
+	</fixed>
+
+	<!-- Login-Error -->
+	<fixed>
+	<item type="rect" id="pam-error">
+		<pos anchor="c" x="50%" y="50%" width="box" height="box"/>
+		<box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+			<item type="label">
+				<normal color="#000000" font="Sans 12"/>
+				<pos anchor="n" x="50%" y="60"/>
+				<text>Login failed.</text>
+			</item>
+		</box>
+	</item>
+	</fixed>
+
+</item>
+
+<!-- icons and text in bottom bar -->
+<item type="rect">
+	<pos x="0" y="-60" width="100%" height="60"/>
+
+	<fixed>
+	<item type="pixmap" id="session_button" button="true">
+		<normal file="icon-session.png"/>
+		<pos x="20" y="20"/>
+	</item>
+	</fixed>
+
+	<!-- session-button -->
+	<fixed>
+	<item type="rect" id="session_button" button="true">
+		<pos x="60" y="30" width="110" height="100%"/>
+		<fixed>
+		<item type="label">
+			<normal color="#ffffff" font="Sans Bold 12"/>
+			<prelight color="#bbbbbb" font="Sans Bold 12"/>
+			<active color="#bbbbbb" font="Sans Bold 12"/>
+			<pos y="0" x="0"/>
+			<stock type="session"/>
+		</item>
+		</fixed>
+	</item>
+	</fixed>
+
+	<fixed>
+	<item type="pixmap" id="system_button" button="true">
+		<normal file="icon-reboot.png"/>
+		<pos x="180" y="20"/>
+	</item>
+	</fixed>
+
+	<!-- menu-button -->
+	<fixed>
+	<item type="rect" id="system_button" button="true">
+		<show modes="console" type="system"/>
+		<pos x="215" y="30" width="50" height="100%"/>
+		<fixed>
+		<item type="label">
+			<normal color="#ffffff" font="Sans Bold 12"/>
+			<prelight color="#bbbbbb" font="Sans Bold 12"/>
+			<active color="#bbbbbb" font="Sans Bold 12"/>
+			<pos y="0" x="0"/>
+			<stock type="system"/>
+		</item>
+		</fixed>
+	</item>
+	</fixed>
+
+	<!-- clock -->
+	<fixed>
+	<item type="label" id="clock">
+		<normal color="#ffffff" font="Sans Bold 11"/>
+		<pos anchor="se" x="-20" y="-10"/>
+		<text>%c</text>
+	</item>
+	</fixed>
+</item>
+</greeter>