diff --git a/mono/tests/ChangeLog b/mono/tests/ChangeLog
index 217b1dfc4bddc..76bd180638460 100644
--- a/mono/tests/ChangeLog
+++ b/mono/tests/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-21 Rodrigo Kumpera  <rkumpera@novell.com>
+
+	Backport of r124059.
+
+	* appdomain-unload-callback.cs: New test for the AppDomain::DomainUnload
+	deadlock.
+
+	* Makefile.am: Test added.
+
 2009-01-21  Mark Probst  <mark.probst@gmail.com>
 
 	Backport of r124028.
diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index b7bf93c35a8ab..acc4461a4013b 100644
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -333,7 +333,8 @@ BASE_TEST_CS_SRC=		\
 	bug-459094.cs	\
 	generic-unloading.2.cs	\
 	generic-unloading-sub.2.cs	\
-	bug-467456.cs
+	bug-467456.cs	\
+	appdomain-unload-callback.cs
 
 if AMD64
 TEST_CS_SRC = $(BASE_TEST_CS_SRC) async-exc-compilation.cs