diff --git a/base/run/rm_conflict.run b/base/run/rm_conflict.run
new file mode 100644
index 0000000..0aaae5a
--- /dev/null
+++ b/base/run/rm_conflict.run
@@ -0,0 +1,33 @@
+build "core init test/rm_conflict test/ldso"
+
+create_boot_directory
+
+install_config {
+	<config>
+		<parent-provides>
+			<service name="ROM"/>
+			<service name="RAM"/>
+			<service name="CPU"/>
+			<service name="RM"/>
+			<service name="CAP"/>
+			<service name="PD"/>
+			<service name="SIGNAL"/>
+			<service name="LOG"/>
+		</parent-provides>
+		<default-route>
+			<any-service> <parent/> </any-service>
+		</default-route>
+		<start name="test-rm_conflict">
+			<resource name="RAM" quantum="4M"/>
+		</start>
+	</config>
+}
+
+build_boot_image "core init test-rm_conflict ld.lib.so libc.lib.so"
+
+append qemu_args "-nographic -m 64"
+
+#run_genode_until {child exited with exit value 0.*} 10
+run_genode_until forever
+
+puts "Test succeeded"
diff --git a/base/src/test/rm_conflict/main.cc b/base/src/test/rm_conflict/main.cc
new file mode 100644
index 0000000..3fce408
--- /dev/null
+++ b/base/src/test/rm_conflict/main.cc
@@ -0,0 +1,58 @@
+/*
+ * \brief  Test RM region conflicts
+ * \author Christian Helmuth
+ * \date   2011-08-12
+ */
+
+#include <base/env.h>
+#include <base/printf.h>
+#include <rom_session/connection.h>
+
+
+using namespace Genode;
+
+static int test()
+{
+	Rom_dataspace_capability rom_ds_cap;
+	try {
+		static Rom_connection rom("binary");
+		rom_ds_cap = rom.dataspace();
+	} catch (Rom_connection::Rom_connection_failed) {
+		PERR("ROM connection for binary failed");
+		return __LINE__;
+	}
+
+	PLOG("got binary ROM");
+
+	void *addr;
+	try {
+		addr = env()->rm_session()->attach(rom_ds_cap);
+	} catch (...) {
+		PERR("exception on ROM attachment");
+		return __LINE__;
+	}
+
+	PLOG("attached ROM at %p", addr);
+
+	try {
+		env()->rm_session()->attach_at(rom_ds_cap, (addr_t)addr);
+	} catch (Rm_session::Region_conflict) {
+		PLOG("caught Region_confict exception on conflicting attach");
+		return 0;
+	} catch (...) {
+		PERR("exception on ROM attachment");
+		throw;
+	}
+
+	PERR("no exception caught?");
+
+	return __LINE__;
+}
+
+
+int main(int argc, char **argv)
+{
+	printf("--- region conflict test ---\n");
+
+	return test();
+}
diff --git a/base/src/test/rm_conflict/target.mk b/base/src/test/rm_conflict/target.mk
new file mode 100644
index 0000000..6aaf590
--- /dev/null
+++ b/base/src/test/rm_conflict/target.mk
@@ -0,0 +1,8 @@
+TARGET = test-rm_conflict
+SRC_CC = main.cc
+LIBS   = cxx env
+
+#
+# Uncomment the following line to trigger the issue
+#
+#LIBS += libc