diff --git a/omemo/.gitmodules b/omemo/.gitmodules
deleted file mode 100644
index 6deb7b85f4ee107320f4946092c1249db627d78e..0000000000000000000000000000000000000000
--- a/omemo/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "doc"]
-	path = doc
-	url = https://github.com/omemo/gajim-omemo.wiki.git
diff --git a/omemo/CHANGELOG b/omemo/CHANGELOG
index d85da2559f01824c3df91a708ca1e7365578bc85..8b51c92a11237b8e52a711c104ebbdc50b3156fd 100644
--- a/omemo/CHANGELOG
+++ b/omemo/CHANGELOG
@@ -1,5 +1,6 @@
-0.9.8 / 2016-11-26
+0.9.8 / 2016-11-28
 - Fix a Problem where OMEMO wouldnt activate after the plugin is updated
+- Add QR Verification Code to Plugin Config
 
 0.9.7 / 2016-11-12
 - Bugfixes
diff --git a/omemo/README.md b/omemo/README.md
deleted file mode 100644
index 7eb2a5844a036778079bbb5311d6c951fd88792d..0000000000000000000000000000000000000000
--- a/omemo/README.md
+++ /dev/null
@@ -1,109 +0,0 @@
-# OMEMO Plugin for Gajim
-
-This Plugin adds support for the [OMEMO Encryption](http://conversations.im/omemo) to [Gajim](https://gajim.org/). This
-plugin is [free software](http://www.gnu.org/philosophy/free-sw.en.html)
-distributed under the GNU General Public License version 3 or any later version.
-
-## Installation
-
-Before you open any issues please read our [Wiki](https://github.com/omemo/gajim-omemo/wiki) which addresses some problems that can occur during an install
-
-### Linux
-
-See [Linux Wiki](https://github.com/omemo/gajim-omemo/wiki/Installing-on-Linux)
-
-### Windows
-
-See [Windows Wiki](https://github.com/omemo/gajim-omemo/wiki/Installing-on-Windows)
-
-### Via Package Manager
-#### Arch
-See [Arch Wiki](https://wiki.archlinux.org/index.php/Gajim#OMEMO_Support)
-
-#### Debian
-Packagename `gajim-omemo` available in backports and testing
-
-#### Gentoo
-`layman -a flow && emerge gajim-omemo`
-
-### Via Gajim PluginManager
-
-Install the current stable version via the Gajim PluginManager. You *need* Gajim
-version *0.16.5* or higher. If your package manager does not provide an up to date version
-you can visit gajim.org for further install instructions.
-
-**NOTE:** You *have* to install `python-axolotl` via PackageManager or depending on your setup you might
-want to use `pip2` as Gajim is using python2.7.
-
-if you still have problems, we have written down the most common problems [here](https://github.com/omemo/gajim-omemo/wiki/It-doesnt-work,-what-should-i-do%3F-(Linux))
-
-## Running
-Enable *OMEMO Multi-End Message and Object Encryption* in the Plugin-Manager.
-If your contact supports OMEMO you should see a new orange fish icon in the chat window.
-
-Encryption will be enabled by default for contacts that support OMEMO.
-If you open the chat window, the Plugin will tell you with a green status message if its *enabled* or *disabled*.
-If you see no status message, your contact doesnt support OMEMO.
-(**Beware**, every status message is green. A green message does not mean encryption is active. Read the message !)
-You can also check if encryption is enabled/disabled, when you click on the OMEMO icon.
-
-When you send your first message the Plugin will query your contacts encryption keys and you will
-see them in a readable fingerprint format in the fingerprint window which pops up.
-you have to trust at least **one** fingerprint to send messages.
-you can receive messages from fingerprints where you didnt made a trust decision, but you cant
-receive Messages from *not trusted* fingerprints
-
-## Groupchat
-
-Groupchat works only in rooms that are
-- non-anonymous
-- members-only
-- works only with contacts that you have in your roster
-
-## Filetransfer
-
-For Filetransfer use the **httpupload** plugin.
-
-For decrypting and showing pictures in chat use the **url_image_preview** plugin.
-
-If you want to use these plugins together with *OMEMO* you have to install the `python-cryptography` package
-
-## Performance
-If you experience lag when sending a message, install `python-cryptography`
-If that doesnt help, you can convert your database to WAL mode with 
-```
-sqlite3 omemo_your@jid.com.db
-PRAGMA journal_mode=WAL
-```
-Warning: This mode could lead to data loss if Gajim crashes
-
-## Debugging
-To see OMEMO related debug output start Gajim with the parameter `-l
-gajim.plugin_system.omemo=DEBUG`.
-
-## Hacking
-This repository contains the current development version. If you want to
-contribute clone the git repository into your Gajim's plugin directory. 
-```shell
-mkdir ~/.local/share/gajim/plugins -p
-cd ~/.local/share/gajim/plugins
-git clone https://github.com/omemo/gajim-omemo
-```
-
-## Support this project
-I develop this project in my free time. Your donation allows me to spend more
-time working on it and on free software generally.
-
-My Bitcoin Address is: `1CnNM3Mree9hU8eRjCXrfCWVmX6oBnEfV1`
-
-[![Support Me via Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/5038679)
-
-## I found a bug
-Please report it to the [issue
-tracker](https://github.com/omemo/gajim-omemo/issues). If you are experiencing
-misbehaviour please provide detailed steps to reproduce and debugging output.
-Always mention the exact Gajim version. 
-
-## Contact
-You can contact me via email at `bahtiar@gadimov.de` or follow me on
-[Twitter](https://twitter.com/_kalkin)
diff --git a/omemo/manifest.ini b/omemo/manifest.ini
index 133be250586e51645090dc1cc03ebe4df43ecc53..10c58002b15b1a4a9a28d30b0c3eeba943b34d91 100644
--- a/omemo/manifest.ini
+++ b/omemo/manifest.ini
@@ -2,10 +2,10 @@
 name: OMEMO
 short_name: omemo
 version: 0.9.8
-description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install some dependencys, you can find install instructions for your system in the Github Wiki.
+description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install some dependencys, you can find install instructions for your system in the Gitlab Wiki.
 authors: Bahtiar `kalkin-` Gadimov <bahtiar@gadimov.de>
  Daniel Gultsch <daniel@gultsch.de>
  Philipp Hörist <philipp@hoerist.com>
-homepage: http://github.com/omemo/gajim-omemo.git
+homepage: https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin
 min_gajim_version: 0.16.5
 max_gajim_version: 0.16.9