diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index 6e1947d1485..3097a23a1e6 100644
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -1316,6 +1316,14 @@ Module::GetEntryPoint(bool leadingUnderscore) const
 		result = "_";
 
 	result += entrypoint;
+
+	if (Environment::GetArch() == "amd64")
+	{
+		size_t at_index = result.find_last_of( '@' );
+		if ( at_index != result.npos )
+			return result.substr (0, at_index );
+	}
+
 	return result;
 }