diff --git a/scripts/build-android.sh b/scripts/build-android.sh
index 8188f3e..63ec165 100755
--- a/scripts/build-android.sh
+++ b/scripts/build-android.sh
@@ -112,7 +112,7 @@ AndroidManifest_xml='<?xml version="1.0" encoding="utf-8"?>
 </manifest>'
 
 # Package prefix
-JAVA_PKG_PREFIX_DOT="io.mraa.at"
+JAVA_PKG_PREFIX_DOT="org.eclipse.mraa.at"
 
 # Package prefix slash to dot
 JAVA_PKG_PREFIX_SLASH="${JAVA_PKG_PREFIX_DOT//\./\/}/upm"
@@ -158,7 +158,7 @@ jar cf $PKG_BUNDLE_DIR/$LIB_NAME-$VERSION-javadoc.jar $LIB_NAME-javadoc/*
 jar cf $PKG_BUNDLE_DIR/$LIB_NAME-$VERSION-sources.jar src/java/*.java
 
 # HACK - mraa pom file groupId is io.mraa (AT is io.mraa.at)
-perl -p -i.bak -e 's/(groupId>)(.*?)(<\/groupId)/\1io.mraa.at\3/' src/java/$LIB_NAME-$VERSION.pom
+perl -p -i.bak -e 's/(groupId>)(.*?)(<\/groupId)/\1org.eclipse.mraa.at\3/' src/java/$LIB_NAME-$VERSION.pom
 
 # HACK - mraa pom file packaging is 'jar' (convert this to 'aar')
 perl -p -i.bak -e 's/(packaging>)(.*?)(<\/packaging)/\1aar\3/' src/java/$LIB_NAME-$VERSION.pom
diff --git a/src/java/pom.xml.in b/src/java/pom.xml.in
index be47502..c12736c 100644
--- a/src/java/pom.xml.in
+++ b/src/java/pom.xml.in
@@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>io.mraa</groupId>
+  <groupId>org.eclipse.mraa</groupId>
   <artifactId>mraa</artifactId>
   <version>@VERSION_SHORT@</version>
   <packaging>jar</packaging>
@@ -16,23 +16,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
   <licenses>
     <license>
       <name>MIT License</name>
-      <url>https://github.com/intel-iot-devkit/mraa/blob/master/COPYING</url>
+      <url>https://github.com/eclipse/mraa/blob/master/COPYING</url>
     </license>
   </licenses>
 
   <developers>
     <developer>
-      <name>Mraa contributors https://github.com/intel-iot-devkit/mraa/graphs/contributors</name>
+      <name>Mraa contributors https://github.com/eclipse/mraa/graphs/contributors</name>
       <email>mraa@lists.01.org</email>
-      <organization>Intel IoT Developer kit</organization>
-      <organizationUrl>https://github.com/intel-iot-devkit</organizationUrl>
+      <organization>Eclipse Foundation</organization>
+      <organizationUrl>https://github.com/eclipse</organizationUrl>
     </developer>
   </developers>
 
   <scm>
-    <connection>scm:git:git://github.com/intel-iot-devkit/mraa.git</connection>
-    <developerConnection>scm:git:ssh://github.com:intel-iot-devkit/mraa.git</developerConnection>
-    <url>https://github.com/intel-iot-devkit/mraa/tree/master</url>
+    <connection>scm:git:git://github.com/eclipse/mraa.git</connection>
+    <developerConnection>scm:git:ssh://github.com:eclipse/mraa.git</developerConnection>
+    <url>https://github.com/eclipse/mraa/tree/master</url>
   </scm>
 
 </project>