diff --git a/HACKING.rst b/HACKING.rst
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
index acdfbfa9..6b822c37 100644
--- a/README.md
+++ b/README.md
@@ -19,18 +19,18 @@ A change has been submitted to StackForge to switch to bare-trusty for this buil
 
 ### Application Specific Sub-Projects
 
-* [monasca-common-model](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-model) - Common domain and event models for monitoring services.
+* [monasca-common-model](https://github.com/openstack/monasca-common/tree/master/java/monasca-common-model) - Common domain and event models for monitoring services.
 
 ### Platform Sub-Projects
 
-* [monasca-common-dropwizard](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-dropwizard) - Utilities for building and testing dropwizard services.
-* [monasca-common-kafka](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-kafka) - Various utilities for working with Kafka.
-* [monasca-common-persistence](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-persistence) - Persistence related infrastructure and utilities.
-* [monasca-common-service](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-service) - Simple service abstractions and utilities.
-* [monasca-common-streaming](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-streaming) - Streaming related utilities.
-* [monasca-common-testing](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-testing) - A set of testing related dependencies.
-* [monasca-common-util](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-util) - Various utilities such as for serialization, dependency injection, date and time, invocation retries, concurrency, etc.
-* [monasca-common-hibernate](https://github.com/stackforge/monasca-common/tree/master/java/monasca-common-hibernate) - Hibernate based model of Monasca SQL schema
+* [monasca-common-dropwizard](https://github.com/openstack/monasca-common/tree/master/java/monasca-common-dropwizard) - Utilities for building and testing dropwizard services.
+* [monasca-common-kafka](https://github.com/openstack/monasca-common/tree/master/java/monasca-common-kafka) - Various utilities for working with Kafka.
+* [monasca-common-persistence](https://github.com/openstack/monasca-common/tree/master/java/monasca-common-persistence) - Persistence related infrastructure and utilities.
+* [monasca-common-service](https://github.com/openstack/monasca-common/tree/master/java/monasca-common-service) - Simple service abstractions and utilities.
+* [monasca-common-streaming](https://github.com/openstack/monasca-common/tree/master/java/monasca-common-streaming) - Streaming related utilities.
+* [monasca-common-testing](https://github.com/openstack/monasca-common/tree/master/java/monasca-common-testing) - A set of testing related dependencies.
+* [monasca-common-util](https://github.com/openstack/monasca-common/tree/master/java/monasca-common-util) - Various utilities such as for serialization, dependency injection, date and time, invocation retries, concurrency, etc.
+* [monasca-common-hibernate](https://github.com/openstack/monasca-common/tree/master/java/monasca-common-hibernate) - Hibernate based model of Monasca SQL schema
 
 python monasca-common
 ======================
diff --git a/java/pom.xml b/java/pom.xml
index 86124b36..80574e01 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -5,7 +5,7 @@
   <groupId>monasca-common</groupId>
   <artifactId>monasca-common</artifactId>
   <version>${computedVersion}</version>
-  <url>http://github.com/stackforge/monasca-common</url>
+  <url>http://github.com/openstack/monasca-common</url>
   <packaging>pom</packaging>
 
   <prerequisites>
@@ -23,8 +23,8 @@
   </properties>
 
   <scm>
-    <connection>scm:git:git@github.com:stackforge/monasca-common</connection>
-    <developerConnection>scm:git:git@github.com:stackforge/monasca-common</developerConnection>
+    <connection>scm:git:git@github.com:openstack/monasca-common</connection>
+    <developerConnection>scm:git:git@github.com:openstack/monasca-common</developerConnection>
   </scm>
 
   <modules>
diff --git a/mkdocs.yml b/mkdocs.yml
index 45cecb51..4361aad5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,4 +1,4 @@
 site_name:
     monasca-common
 repo_url:
-    'https://github.com/stackforge/monasca-common'
+    'https://github.com/openstack/monasca-common'
diff --git a/pom.xml b/pom.xml
index f52d9f3f..212c20da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>monasca</groupId>
   <artifactId>monasca-common</artifactId>
   <version>1.1.0</version>
-  <url>http://github.com/stackforge/monasca-common</url>
+  <url>http://github.com/openstack/monasca-common</url>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/setup.cfg b/setup.cfg
index f64393c4..c20bec03 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 name = monasca-common
 summary = Monasca common python modules
 author = Hewlett-Packard
-home-page = https://github.com/stackforge/monasca-common
+home-page = https://github.com/openstack/monasca-common
 classifier =
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators