diff --git a/.travis.yml b/.travis.yml
index c568eba..b2e7cd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,15 @@ deploy:
 - provider: releases
   skip_cleanup: true
   api_key:
-    secure: a3C4FbuQ2UeZo3AxnjcdPJ2joY1hJlxfAZBBJ/eb2m3X2XSJCki8n+UNqaGMkepYaDGhXYAKYNqZx9Dpjh+Mc10g/5Bo4BHWGCsOkr5VJL5SkHc+cMtYq0XLhGHzfmBIvNS5LS/hrRknQF2dO7CCJczujZx/ZTs4txIYTQp6zOtRXKwfbNuuSQDC6e1W+w409wI/dddARFuWJ2bGxQ+S4YvzwC9hlmwPp9u/RdI6a1QZCvvext5wT+hTRNvBn+q6ncfvniDhwngfjCWAiRu0ARJOEKo8mBBGrr5wYw4azJgVp0cLms1tOo7kdzkAxyroz7WUBX9zC7HnrtNmNrgyolAmVe0t5j6VHryLLAzqaSbcTPilJAB7OWw9vYFV3HJR2//SxHigsPkXdyFBVXNVy6WwZLYeykSlevxTiszwNhY3E0Iz/t/YeFafRMPcoZNWOdMVSHq5gZRavLP7GvOJVQCieyD+13g2roTLjYjDr1Nvn/fagWZqekJejyHQ5xNOTIM2Py5bXuv7Ro2kqmvzCJxK1tizOWuFqPq4NWgyVOxuaNGnHkRUYN4v08S65e5x6a38H5Un+wX7bA9cWhG8C3V1asJkygYP2D68LmFMZAve76BYOS83kaX7VJKLVKkP0eOUXOQdeMK0BeedwJf9FJkU5vpSPHNYzZfJgZ48uVA=
-  file_glob: true
+    secure: VqEwCzfMWLkWCozidJWvGMbE6ue49trH53+PgwpXZQNJjeG1j1vV+MWPkmIcO399Fca1kjKHLOjG8IpyHgwWzsEHtQ5US21DQ3tIWHsKjedtEOpj82GxaYyp7lGccFGe+3tfdyS2et3s/a8qf0DNNvWM3xBcpE6+IQ6FzhFt18M6ctnJzkMYrFk/DyNacRdqPbKNFCMzeKrQ5EO/hZ5x/o2jmsresaB1Iliq+oz6/3jnuBDsU5O/+jQses6WNMmjtq6ucXXwHbjNEoYByxVir6NAKz5y5p8WkkaFZ9kXd/lvMuVOiz5QzU3AJAKuqTK2exXqPMngQtKt3/wwtQpEgmw8unnhwgyd2iYXazR5AgJXyH59srFFHiJ4DSGxIImPr+bFtr4mGgpfUUE3es//Z+4QDkMyBYPDQz+fRFUjjk2Rz7JV2sTd2nVQfk4nU/LXz4LZCsuVvgvJnguUHxqCDU88iOCCmNLBgu98+P03LfVOmPjvypYPPHXCxwSBSEYboIAemM2lVPcgJGuTrYfcWru8ZACNzk8aq7/SUKfJILAGuYCHVEeB8IJeHlHqWlBb2j3xbAF4GaWRoipAXQB0B0/yzMM3hQBteuQmfHRy/UqSsj2fKIFQ9xNpnf6jvZW75ut1cZxN4xuzL3RmEh/spe/YZL+S8ZpemRAq7JHcQjU=
   file: target/base-*.jar
+  file_glob: true
   on:
+    repo: dm-drogeriemarkt/mail2blog-base
     branch: master
-    repo: gellweiler/mail2blog-base
     tags: true
 - provider: script
+  skip_cleanup: true
   script: cd/deploy.sh
   on:
     branch: master
@@ -30,4 +31,4 @@ env:
   global:
   - OSSRH_JIRA_USERNAME=mail2blog
   - GPG_KEY_NAME=mail2blog.dmDeutschland@dm.de
-  - secure: c09AEnJ2Ai3HVJm/dK42SA9fiS9Msqb0yQz+TxF2hru+LEluxGZvKaSiYKq40eH2cOqq+Re1PrNzZhx0uHciCgAae/3+9caz4UotpuZu+VHPSj2CeCj4Ksr7Vmc520AuBYBh1CwpQE/d6SGQNDkmQqvK73EHmCvuMXj5CAx0bsvWNvwKaTOuPMDoK4g3laqT4QF//ZbClCmjLtqnKVA2SF+LexuBXTBpx2eTjuHrAG6+w41KDefnBd2NFpXJU7TvH90LvLXyjFXdDpIaKZ93umDcPvpBgCYd9ufXs/NldauXupzo0ArGiUoya2BmPpq5UIckihJZ3grGiFr0nn+cz+gHp21j57CPGLT9fhMTXqtO96sj/VHaisxSPKocn8h69E44oV6F5MdJ5l9UU6lHPYYQJpIwjaa1XoDm8vJFBlFL6WIpKpcmGMkqfLGV2q6YPvmJrNN1HTjfJlzb1MDnkOMqIR9SpgeFbUrWtF75XaPtlvTiklSOGlTlsAifb+dxCx0PkkVdqcCb0rk4GdhV9RImGeel6xzTLW0a7xEXELglrFyGYu4M48ezo5LeW0uOqEiD24JUaaL1N4NarHIwbvH9dfR6BLHoJS33RT67/nHjvdZjf2HZy9F7JZ4Xv8Ci3q1mtM4ZXSu6GiHAZ5GGpp2Im6HObnrLwzcwfReiaXo=
+  - secure: Ap/rByhC967Pq6lbmDweOijYlQ0nQ5J1ECSOfr64gEYG7pGoTd50RyjnipKFegJD++GeYTouIKWodxJOXSPILoY/rwV8fh5Lb+kJVsD2xFRlLWbuJa6c2NyRoczZlAnVEkL+Mg7bDFOferlqLI4ciEAvb6r4tEqDPX6/EUBZcjel/MTJTNIPgVXHCMNYEm3rIkOmzVUZ25ZlKEIKPUSJnpb6Nb7l4Ax8/U1sAUQDpLEtJGUlay2j1Vw5ijnN5bK79BqgkvQlKKbWY+AJnyyNhCL5VTFM2AwXO3Mzy1BXk29CDAorSD0MzpqDIS3SnhM0HmMtPAc8X9u9PI+rwVMnbB3mp/caDdfhzov0SKgc4yWEwEU6yeHWbLYG1hW4NeEP1FFahZSaWwY4KUxGZ+JIBgvxmyxmuAX1o+nQUvGjFpcJQI/iG3FzjM/FluF59cIzdnH2/Ju/b/QCxuFDpIrdt7w9N4ZjDnz+IUHj6VTTM0AL722dIEIoFg4XIY2frJp3Q/g5gaoQMiZlLqHhevMlPVCMeG+9FMYttdRY/innHtylvaKOwHVz7OG9ZSt4tYIQtmo0UOG0Cu7daTMSpfiy8HIaRmOPh4PUCECink6o9t1gMgNSE+/NhT5eBVTZ9FrcwDcxsCuP4Nt5gGYLnDCHjgwjEw42G80Qu4crhTB97Wo=
diff --git a/README.md b/README.md
index 58369c8..8d9f2d2 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@ Contains the code to convert emails to confluence markup that is independent of
 
 Hosted on [Maven Central](https://search.maven.org/search?q=g:de.dm.mail2blog%20AND%20a:base&core=gav)
 
-[![Build Status](https://travis-ci.org/gellweiler/mail2blog-base.svg?branch=master)](https://travis-ci.org/gellweiler/mail2blog-base)
-[![Unit Test Coverage](https://img.shields.io/codecov/c/github/gellweiler/mail2blog-base.svg)](https://codecov.io/gh/gellweiler/mail2blog-base)
+[![Build Status](https://travis-ci.org/dm-drogeriemarkt/mail2blog-base.svg?branch=master)](https://travis-ci.org/dm-drogeriemarkt/mail2blog-base)
+[![Unit Test Coverage](https://img.shields.io/codecov/c/github/dm-drogeriemarkt/mail2blog-base.svg)](https://codecov.io/gh/dm-drogeriemarkt/mail2blog-base)
 
 ## License
 Original work Copyright (c) 2008, Liip AG
diff --git a/cd/codesigning.asc.enc b/cd/codesigning.asc.enc
index 6b1b33f..0750328 100644
Binary files a/cd/codesigning.asc.enc and b/cd/codesigning.asc.enc differ
diff --git a/pom.xml b/pom.xml
index 1a34e80..ec90124 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.dm.mail2blog</groupId>
     <artifactId>base</artifactId>
-    <version>2.1.5</version>
+    <version>2.1.6</version>
     <packaging>jar</packaging>
 
     <name>Email to Confluence (base library)</name>
@@ -19,9 +19,9 @@
     </organization>
 
     <scm>
-        <url>https://github.com/gellweiler/mail2blog-base</url>
-        <connection>scm:git:git://github.com/gellweiler/mail2blog-base.git</connection>
-        <developerConnection>scm:git:git@github.com/gellweiler/mail2blog-base.git</developerConnection>
+        <url>https://github.com/dm-drogeriemarkt/mail2blog-base</url>
+        <connection>scm:git:git://github.com/dm-drogeriemarkt/mail2blog-base.git</connection>
+        <developerConnection>scm:git:git@github.com/dm-drogeriemarkt/mail2blog-base.git</developerConnection>
     </scm>
 
     <developers>