diff --git a/source/app.d b/source/app.d
index d72a7e9..b109b1d 100644
--- a/source/app.d
+++ b/source/app.d
@@ -10,6 +10,7 @@
 import dub.compilers.compiler;
 import dub.dependency;
 import dub.dub;
+import dub.generators.generator;
 import dub.package_;
 import dub.platform;
 import dub.project;
@@ -94,11 +95,13 @@
 		Url registryUrl = Url.parse("http://registry.vibed.org/");
 		logDebug("Using dub registry url '%s'", registryUrl);
 
+		auto compiler = getCompiler(compiler_name);
+
 		// FIXME: take into account command line flags
 		BuildPlatform build_platform;
 		build_platform.platform = determinePlatform();
 		build_platform.architecture = determineArchitecture();
-		build_platform.compiler = "dmd";
+		build_platform.compiler = compiler.name;
 
 		if( print_platform ){
 			logInfo("Build platform:");
@@ -117,137 +120,18 @@
 				assert(false);
 			case "help":
 				showHelp(cmd);
-				break;
+				return 0;
 			case "init":
 				string dir = ".";
 				if( args.length >= 2 ) dir = args[1];
 				initDirectory(dir);
-				break;
-			case "run":
-			case "build":
-				if( !existsFile("package.json") && !existsFile("source/app.d") ){
-					logInfo("");
-					logInfo("Neither package.json, nor source/app.d was found in the current directory.");
-					logInfo("Please run dub from the root directory of an existing package, or create a new");
-					logInfo("package using \"dub init <name>\".");
-					logInfo("");
-					showHelp(null);
-					return 1;
-				}
-
-				dub.loadPackageFromCwd();
-				auto def_config = dub.getDefaultConfiguration(build_platform);
-				if( !build_config.length ) build_config = def_config;
-
-				auto compiler = getCompiler(compiler_name);
-
-				if( print_builds ){
-					logInfo("Available build types:");
-					foreach( tp; ["debug", "release", "unittest", "profile"] )
-						logInfo("  %s", tp);
-					logInfo("");
-				}
-
-				if( print_configs ){
-					logInfo("Available configurations:");
-					foreach( tp; dub.configurations )
-						logInfo("  %s%s", tp, tp == def_config ? " [deault]" : null);
-					logInfo("");
-				}
-
-				if( !nodeps ){
-					logInfo("Checking dependencies in '%s'", dub.projectPath);
-					logDebug("dub initialized");
-					dub.update(annotate ? UpdateOptions.JustAnnotate : UpdateOptions.None);
-				}
-
-				enforce(build_config.length == 0 || dub.configurations.canFind(build_config), "Unknown build configuration: "~build_config);
-
-				//Added check for existance of [AppNameInPackagejson].d
-				//If exists, use that as the starting file.
-				auto outfile = getBinName(dub);
-				auto mainsrc = getMainSourceFile(dub);
-
-				logDebug("Application output name is '%s'", outfile);
-
-				// Create start script, which will be used by the calling bash/cmd script.
-				// build "rdmd --force %DFLAGS% -I%~dp0..\source -Jviews -Isource @deps.txt %LIBS% source\app.d" ~ application arguments
-				// or with "/" instead of "\"
-				string[] flags = ["--force", "--build-only", "--compiler="~compiler_name];
-				Path run_exe_file;
-				if( cmd == "build" ){
-					flags ~= "-of"~(dub.binaryPath~outfile).toNativeString();
-				} else {
-					import std.random;
-					auto rnd = to!string(uniform(uint.min, uint.max)) ~ "-";
-					auto tmp = environment.get("TEMP");
-					if( !tmp.length ) tmp = environment.get("TMP");
-					if( !tmp.length ){
-						version(Posix) tmp = "/tmp";
-						else tmp = ".";
-					}
-					run_exe_file = Path(tmp~"/.rdmd/source/"~rnd~outfile);
-					flags ~= "-of"~run_exe_file.toNativeString();
-				}
-
-				auto settings = dub.getBuildSettings(build_platform, build_config);
-				settings.addDFlags(["-w"/*, "-property"*/]);
-				settings.addVersions(getPackagesAsVersion(dub));
-				string dflags = environment.get("DFLAGS");
-				if( dflags ){
-					build_type = "$DFLAGS";
-				} else {
-					switch( build_type ){
-						default: throw new Exception("Unknown build configuration: "~build_type);
-						case "plain": dflags = ""; break;
-						case "debug": dflags = "-g -debug"; break;
-						case "release": dflags = "-release -O -inline"; break;
-						case "unittest": dflags = "-g -unittest"; break;
-						case "profile": dflags = "-g -O -inline -profile"; break;
-						case "docs": assert(false, "docgen not implemented");
-					}
-				}
-				settings.addDFlags(dflags.split());
-
-				compiler.prepareBuildSettings(settings, BuildSetting.commandLine);
-				flags ~= settings.dflags;
-				flags ~= (mainsrc).toNativeString();
-
-				if( build_config.length ) logInfo("Building configuration "~build_config~", build type "~build_type);
-				else logInfo("Building default configuration, build type "~build_type);
-
-				logInfo("Running %s", "rdmd " ~ join(flags, " "));
-				auto rdmd_pid = spawnProcess("rdmd", flags);
-				auto result = rdmd_pid.wait();
-				enforce(result == 0, "Build command failed with exit code "~to!string(result));
-
-				if( settings.copyFiles.length ){
-					logInfo("Copying files...");
-					foreach( f; settings.copyFiles ){
-						auto src = Path(f);
-						auto dst = (run_exe_file.empty ? dub.binaryPath : run_exe_file.parentPath) ~ Path(f).head;
-						logDebug("  %s to %s", src.toNativeString(), dst.toNativeString());
-						try copyFile(src, dst, true);
-						catch logWarn("Failed to copy to %s", dst.toNativeString());
-					}
-				}
-
-				if( cmd == "run" ){
-					auto prg_pid = spawnProcess(run_exe_file.toNativeString(), args[1 .. $]);
-					result = prg_pid.wait();
-					remove(run_exe_file.toNativeString());
-					foreach( f; settings.copyFiles )
-						remove((run_exe_file.parentPath ~ Path(f).head).toNativeString());
-					enforce(result == 0, "Program exited with code "~to!string(result));
-				}
-
-				break;
+				return 0;
 			case "upgrade":
 				dub.loadPackageFromCwd();
 				logInfo("Upgrading project in '%s'", dub.projectPath);
 				logDebug("dub initialized");
 				dub.update(UpdateOptions.Reinstall | (annotate ? UpdateOptions.JustAnnotate : UpdateOptions.None));
-				break;
+				return 0;
 			case "install":
 				enforce(args.length >= 2, "Missing package name.");
 				auto location = InstallLocation.UserWide;
@@ -279,16 +163,67 @@
 						logInfo("  %s %s: %s", p.name, p.ver, p.path.toNativeString());
 				logInfo("");
 				break;
+			case "run":
+			case "build":
 			case "generate":
-				string ide;
-				if( args.length >= 2 ) ide = args[1];
-				if(ide.empty) {
-					logInfo("Usage: dub generate <ide_identifier>");
-					return -1;
+				if( !existsFile("package.json") && !existsFile("source/app.d") ){
+					logInfo("");
+					logInfo("Neither package.json, nor source/app.d was found in the current directory.");
+					logInfo("Please run dub from the root directory of an existing package, or create a new");
+					logInfo("package using \"dub init <name>\".");
+					logInfo("");
+					showHelp(null);
+					return 1;
 				}
+
 				dub.loadPackageFromCwd();
-				dub.generateProject(ide, build_platform);
-				logDebug("Project files generated.");
+
+				string ide;
+				if( cmd == "run" || cmd == "build" ) ide = "rdmd";
+				else {
+					if( args.length >= 2 ) ide = args[1];
+					if(ide.empty) {
+						logInfo("Usage: dub generate <ide_identifier>");
+						return 1;
+					}
+				}
+
+
+				auto def_config = dub.getDefaultConfiguration(build_platform);
+				if( !build_config.length ) build_config = def_config;
+
+				if( print_builds ){
+					logInfo("Available build types:");
+					foreach( tp; ["debug", "release", "unittest", "profile"] )
+						logInfo("  %s", tp);
+					logInfo("");
+				}
+
+				if( print_configs ){
+					logInfo("Available configurations:");
+					foreach( tp; dub.configurations )
+						logInfo("  %s%s", tp, tp == def_config ? " [default]" : null);
+					logInfo("");
+				}
+
+				if( !nodeps ){
+					logInfo("Checking dependencies in '%s'", dub.projectPath);
+					logDebug("dub initialized");
+					dub.update(annotate ? UpdateOptions.JustAnnotate : UpdateOptions.None);
+				}
+
+				enforce(build_config.length == 0 || dub.configurations.canFind(build_config), "Unknown build configuration: "~build_config);
+
+				GeneratorSettings gensettings;
+				gensettings.platform = build_platform;
+				gensettings.config = build_config;
+				gensettings.buildType = build_type;
+				gensettings.compiler = compiler;
+				gensettings.compilerBinary = compiler_name;
+				gensettings.run = cmd == "run";
+				gensettings.runArgs = args[1 .. $];
+
+				dub.generateProject("rdmd", gensettings);
 				break;
 		}
 
@@ -356,39 +291,6 @@
 `);
 }
 
-private string stripDlangSpecialChars(string s) 
-{
-	char[] ret = s.dup;
-	for(int i=0; i<ret.length; ++i)
-		if(!isAlpha(ret[i]))
-			ret[i] = '_';
-	return to!string(ret);
-}
-
-private string[] getPackagesAsVersion(const Dub dub)
-{
-	string[] ret;
-	string[string] pkgs = dub.installedPackages();
-	foreach(id, vers; pkgs)
-		ret ~= "Have_" ~ stripDlangSpecialChars(id);
-	return ret;
-}
-
-private string getBinName(const Dub dub)
-{
-	// take the project name as the base or fall back to "app"
-	string ret = dub.projectName;
-	if( ret.length == 0 ) ret ="app";
-	version(Windows) { ret ~= ".exe"; }
-	return ret;
-} 
-
-private Path getMainSourceFile(const Dub dub)
-{
-	auto p = Path("source") ~ (dub.projectName ~ ".d");
-	return existsFile(p) ? p : Path("source/app.d");
-}
-
 private void initDirectory(string fName)
 { 
     Path cwd; 
diff --git a/source/dub/dub.d b/source/dub/dub.d
index 15f6358..783e57f 100644
--- a/source/dub/dub.d
+++ b/source/dub/dub.d
@@ -164,13 +164,9 @@
 
 	/// Generate project files for a specified IDE.
 	/// Any existing project files will be overridden.
-	void generateProject(string ide, BuildPlatform build_platform) {
+	void generateProject(string ide, GeneratorSettings settings) {
 		auto generator = createProjectGenerator(ide, m_app, m_packageManager);
-		if(generator is null ) {
-			logError("Unsupported IDE, there is no generator available for '"~ide~"'");
-			throw new Exception("Unsupported IDE, there is no generator available for '"~ide~"'");
-		}
-		generator.generateProject(build_platform);
+		generator.generateProject(settings);
 	}
 	
 	/// Creates a zip from the application.
diff --git a/source/dub/generators/compiler.d b/source/dub/generators/compiler.d
deleted file mode 100644
index 52056b9..0000000
--- a/source/dub/generators/compiler.d
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
-	
-	Copyright: © 2012 Matthias Dondorff
-	License: Subject to the terms of the MIT license, as written in the included LICENSE.txt file.
-	Authors: Matthias Dondorff
-*/
-module dub.generators.compiler;
-
-struct Compiler {
-
-}
\ No newline at end of file
diff --git a/source/dub/generators/generator.d b/source/dub/generators/generator.d
index 9d3a856..e42d5b6 100644
--- a/source/dub/generators/generator.d
+++ b/source/dub/generators/generator.d
@@ -9,6 +9,7 @@
 
 import dub.compilers.compiler;
 import dub.generators.monod;
+import dub.generators.rdmd;
 import dub.generators.visuald;
 import dub.package_;
 import dub.packagemanager;
@@ -18,18 +19,41 @@
 import vibe.core.log;
 
 
-/// A project generator generates projects :-/
+/**
+	Common interface for project generators/builders.
+*/
 interface ProjectGenerator
 {
-	void generateProject(BuildPlatform build_platform);
+	void generateProject(GeneratorSettings settings);
 }
 
-/// Creates a project generator.
-ProjectGenerator createProjectGenerator(string projectType, Project app, PackageManager mgr) {
+
+struct GeneratorSettings {
+	BuildPlatform platform;
+	string config;
+	Compiler compiler;
+	string compilerBinary; // compiler executable name
+
+	// only used for generator "rdmd"
+	bool run;
+	string[] runArgs;
+	string buildType;
+}
+
+
+/**
+	Creates a project generator of the given type for the specified project.
+*/
+ProjectGenerator createProjectGenerator(string generator_type, Project app, PackageManager mgr)
+{
 	enforce(app !is null, "app==null, Need an application to work on!");
 	enforce(mgr !is null, "mgr==null, Need a package manager to work on!");
-	switch(projectType) {
-		default: return null;
+	switch(generator_type) {
+		default:
+			throw new Exception("Unknown project generator: "~generator_type);
+		case "rdmd":
+			logTrace("Generating rdmd generator.");
+			return new RdmdGenerator(app, mgr);
 		case "MonoD":
 			logTrace("Generating MonoD generator.");
 			return new MonoDGenerator(app, mgr);
diff --git a/source/dub/generators/monod.d b/source/dub/generators/monod.d
index c8c2990..2e3db5a 100644
--- a/source/dub/generators/monod.d
+++ b/source/dub/generators/monod.d
@@ -40,10 +40,10 @@
 		m_allConfigs ~= Config("Debug", "AnyCPU", "Any CPU");
 	}
 	
-	void generateProject(BuildPlatform build_platform)
+	void generateProject(GeneratorSettings settings)
 	{
 		logTrace("About to generate projects for %s, with %s direct dependencies.", m_app.mainPackage().name, to!string(m_app.mainPackage().dependencies().length));
-		generateProjects(m_app.mainPackage(), build_platform);
+		generateProjects(m_app.mainPackage(), settings.platform);
 		generateSolution();
 	}
 	
diff --git a/source/dub/generators/rdmd.d b/source/dub/generators/rdmd.d
new file mode 100644
index 0000000..322d872
--- /dev/null
+++ b/source/dub/generators/rdmd.d
@@ -0,0 +1,137 @@
+/**
+	Generator for direct RDMD builds.
+	
+	Copyright: © 2013 rejectedsoftware e.K.
+	License: Subject to the terms of the MIT license, as written in the included LICENSE.txt file.
+	Authors: Sönke Ludwig
+*/
+module dub.generators.rdmd;
+
+import dub.compilers.compiler;
+import dub.generators.generator;
+import dub.package_;
+import dub.packagemanager;
+import dub.project;
+
+import std.array;
+import std.conv;
+import std.exception;
+import std.file;
+import std.string;
+import stdx.process;
+
+import vibe.core.file;
+import vibe.core.log;
+import vibe.inet.path;
+
+
+class RdmdGenerator : ProjectGenerator {
+	private {
+		Project m_app;
+		PackageManager m_pkgMgr;
+	}
+	
+	this(Project app, PackageManager mgr)
+	{
+		m_app = app;
+		m_pkgMgr = mgr;
+	}
+	
+	void generateProject(GeneratorSettings settings)
+	{
+
+		//Added check for existance of [AppNameInPackagejson].d
+		//If exists, use that as the starting file.
+		auto outfile = getBinName(m_app);
+		auto mainsrc = getMainSourceFile(m_app);
+
+		logDebug("Application output name is '%s'", outfile);
+
+		// Create start script, which will be used by the calling bash/cmd script.
+		// build "rdmd --force %DFLAGS% -I%~dp0..\source -Jviews -Isource @deps.txt %LIBS% source\app.d" ~ application arguments
+		// or with "/" instead of "\"
+		string[] flags = ["--force", "--build-only", "--compiler="~settings.compilerBinary];
+		Path run_exe_file;
+		if( !settings.run ){
+			flags ~= "-of"~(m_app.binaryPath~outfile).toNativeString();
+		} else {
+			import std.random;
+			auto rnd = to!string(uniform(uint.min, uint.max)) ~ "-";
+			auto tmp = environment.get("TEMP");
+			if( !tmp.length ) tmp = environment.get("TMP");
+			if( !tmp.length ){
+				version(Posix) tmp = "/tmp";
+				else tmp = ".";
+			}
+			run_exe_file = Path(tmp~"/.rdmd/source/"~rnd~outfile);
+			flags ~= "-of"~run_exe_file.toNativeString();
+		}
+
+		auto buildsettings = m_app.getBuildSettings(settings.platform, settings.config);
+		buildsettings.addDFlags(["-w"/*, "-property"*/]);
+		string dflags = environment.get("DFLAGS");
+		if( dflags ){
+			settings.buildType = "$DFLAGS";
+		} else {
+			switch(settings.buildType){
+				default: throw new Exception("Unknown build configuration: "~settings.buildType);
+				case "plain": dflags = ""; break;
+				case "debug": dflags = "-g -debug"; break;
+				case "release": dflags = "-release -O -inline"; break;
+				case "unittest": dflags = "-g -unittest"; break;
+				case "profile": dflags = "-g -O -inline -profile"; break;
+				case "docs": assert(false, "docgen not implemented");
+			}
+		}
+		buildsettings.addDFlags(dflags.split());
+
+		settings.compiler.prepareBuildSettings(buildsettings, BuildSetting.commandLine);
+		flags ~= buildsettings.dflags;
+		flags ~= (mainsrc).toNativeString();
+
+		if( settings.config.length ) logInfo("Building configuration "~settings.config~", build type "~settings.buildType);
+		else logInfo("Building default configuration, build type "~settings.buildType);
+
+		logInfo("Running %s", "rdmd " ~ join(flags, " "));
+		auto rdmd_pid = spawnProcess("rdmd", flags);
+		auto result = rdmd_pid.wait();
+		enforce(result == 0, "Build command failed with exit code "~to!string(result));
+
+		// TODO: move to a common place - this is not generator specific
+		if( buildsettings.copyFiles.length ){
+			logInfo("Copying files...");
+			foreach( f; buildsettings.copyFiles ){
+				auto src = Path(f);
+				auto dst = (run_exe_file.empty ? m_app.binaryPath : run_exe_file.parentPath) ~ Path(f).head;
+				logDebug("  %s to %s", src.toNativeString(), dst.toNativeString());
+				try copyFile(src, dst, true);
+				catch logWarn("Failed to copy to %s", dst.toNativeString());
+			}
+		}
+
+		if( settings.run ){
+			auto prg_pid = spawnProcess(run_exe_file.toNativeString(), settings.runArgs);
+			result = prg_pid.wait();
+			remove(run_exe_file.toNativeString());
+			foreach( f; buildsettings.copyFiles )
+				remove((run_exe_file.parentPath ~ Path(f).head).toNativeString());
+			enforce(result == 0, "Program exited with code "~to!string(result));
+		}
+	}
+}
+
+private string getBinName(in Project prj)
+{
+	// take the project name as the base or fall back to "app"
+	string ret = prj.name;
+	if( ret.length == 0 ) ret ="app";
+	version(Windows) { ret ~= ".exe"; }
+	return ret;
+} 
+
+private Path getMainSourceFile(in Project prj)
+{
+	auto p = Path("source") ~ (prj.name ~ ".d");
+	return existsFile(p) ? p : Path("source/app.d");
+}
+
diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d
index 684c400..537ab89 100644
--- a/source/dub/generators/visuald.d
+++ b/source/dub/generators/visuald.d
@@ -41,9 +41,9 @@
 		m_pkgMgr = mgr;
 	}
 	
-	void generateProject(BuildPlatform buildPlatform) {
+	void generateProject(GeneratorSettings settings) {
 		logTrace("About to generate projects for %s, with %s direct dependencies.", m_app.mainPackage().name, to!string(m_app.mainPackage().dependencies().length));
-		generateProjects(m_app.mainPackage(), buildPlatform);
+		generateProjects(m_app.mainPackage(), settings.platform);
 		generateSolution();
 	}
 	
diff --git a/source/dub/project.d b/source/dub/project.d
index 2b1031a..aae2f8e 100644
--- a/source/dub/project.d
+++ b/source/dub/project.d
@@ -185,6 +185,10 @@
 			addImportPath((pkg.path ~ "views").toNativeString(), false);
 		}
 
+		// add version identifiers for available packages
+		foreach(pack; this.installedPackages)
+			ret.addVersions(["Have_" ~ stripDlangSpecialChars(pack.name)]);
+
 		return ret;
 	}
 
@@ -526,7 +530,17 @@
 	}
 }
 
-private bool isIdentChar(char ch)
+private bool isIdentChar(dchar ch)
 {
 	return ch >= 'A' && ch <= 'Z' || ch >= 'a' && ch <= 'z' || ch >= '0' && ch <= '9' || ch == '_';
-}
\ No newline at end of file
+}
+
+private string stripDlangSpecialChars(string s) 
+{
+	import std.array;
+	import std.uni;
+	auto ret = appender!string();
+	foreach(ch; s)
+		ret.put(isIdentChar(ch) ? ch : '_');
+	return ret.data;
+}