diff --git a/main/Defaults.scala b/main/Defaults.scala
index d3477958f..81da13b60 100644
--- a/main/Defaults.scala
+++ b/main/Defaults.scala
@@ -626,8 +626,8 @@ object Classpaths
 		homepage in GlobalScope :== None,
 		licenses in GlobalScope :== Nil,
 		organization <<= organization or normalizedName.identity,
-		organizationName in GlobalScope <<= organizationName or organization.identity,
-		organizationHomepage in GlobalScope <<= organizationHomepage or homepage.identity,
+		organizationName <<= organizationName or organization.identity,
+		organizationHomepage <<= organizationHomepage or homepage.identity,
 		projectInfo <<= (name, description, homepage, licenses, organizationName, organizationHomepage) apply ModuleInfo,
 		classpathFilter in GlobalScope :== "*.jar" | "*.so" | "*.dll",
 		externalResolvers <<= (externalResolvers.task.?, resolvers) {