diff --git a/package/Config.in b/package/Config.in
index bc5e620445..7507ec15ef 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -318,6 +318,7 @@ source "package/libpng/Config.in"
 source "package/libungif/Config.in"
 source "package/lite/Config.in"
 source "package/pixman/Config.in"
+source "package/sawman/Config.in"
 source "package/sdl/Config.in"
 source "package/sdl_image/Config.in"
 source "package/sdl_mixer/Config.in"
diff --git a/package/sawman/Config.in b/package/sawman/Config.in
new file mode 100644
index 0000000000..8dd3ace2bf
--- /dev/null
+++ b/package/sawman/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_SAWMAN
+	bool "SawMan (Window Manager)"
+	depends on BR2_PACKAGE_DIRECTFB
+	help
+	  SaWMan is a new window manager module for use with DirectFB. 
+          Its main difference to the default module is that it allows 
+          one process to be an application and window manager, 
+          implementing all kinds of diversity, while SaWMan is only the 
+          working horse.
+
+	   See http://www.directfb.org/downloads/Extras/README.SaWMan
+
diff --git a/package/sawman/sawman.mk b/package/sawman/sawman.mk
new file mode 100644
index 0000000000..4956878207
--- /dev/null
+++ b/package/sawman/sawman.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# SAWMAN
+#
+#############################################################
+SAWMAN_VERSION:=1.2.0-rc1
+SAWMAN_SOURCE:=SaWMan-$(SAWMAN_VERSION).tar.gz
+SAWMAN_SITE:=http://www.directfb.org/downloads/Extras
+SAWMAN_INSTALL_STAGING = YES
+SAWMAN_INSTALL_TARGET = YES
+SAWMAN_CONF_ENV = LDFLAGS="-L$(STAGING_DIR)/usr/lib -Wl,--rpath-link -Wl,$(STAGING_DIR)/usr/lib"
+SAWMAN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install-strip
+SAWMAN_DEPENDENCIES = directfb
+
+$(eval $(call AUTOTARGETS,package,sawman))
+