diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e65dc6..7486227 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ### master
+- update readme because of github organization change to
+  [tmux-plugins](https://github.com/tmux-plugins)
 
 ### v0.0.2, 2014-07-17
 - run all *.tmux plugin files as executables
diff --git a/HOW_TO_PLUGIN.md b/HOW_TO_PLUGIN.md
index bc655e9..3f030be 100644
--- a/HOW_TO_PLUGIN.md
+++ b/HOW_TO_PLUGIN.md
@@ -89,7 +89,7 @@ To try if this works, execute the plugin run file:
 That should set up the key binding. Now hit `prefix + T` and see if it works.
 
 If you get stuck you can download and check this tutorial
-[plugin here](https://github.com/bruno-/tmux_example_plugin).
+[plugin here](https://github.com/tmux-plugins/tmux-example-plugin).
 
 ### 6. publish the plugin
 
diff --git a/PLUGINS.md b/PLUGINS.md
index a9489b1..2bf7bdd 100644
--- a/PLUGINS.md
+++ b/PLUGINS.md
@@ -3,11 +3,11 @@
 If you create a plugin, feel free to create a pull request that adds it to the
 list.
 
-- [pain control](https://github.com/bruno-/tmux_pain_control) - standard
+- [pain control](https://github.com/tmux-plugins/tmux-pain-control) - standard
   bindings for controlling panes.
-- [goto session](https://github.com/bruno-/tmux_goto_session) - faster session
+- [goto session](https://github.com/tmux-plugins/tmux-goto-session) - faster session
   switching.
-- [battery osx](https://github.com/bruno-/tmux_battery_osx) - battery status
+- [battery osx](https://github.com/tmux-plugins/tmux-battery-osx) - battery status
   for OSX in tmux `status-right`
-- [logging](https://github.com/bruno-/tmux_logging) - easy logging and
+- [logging](https://github.com/tmux-plugins/tmux-logging) - easy logging and
   screen capturing.
diff --git a/README.md b/README.md
index 2871723..62d9f7b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Requirements: `tmux` version 1.9 (or higher), `git`
 
 Clone TPM:
 
-    $ git clone https://github.com/bruno-/tpm ~/.tmux/plugins/tpm
+    $ git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
 
 Put this at the bottom of your `.tmux.conf` (backslashes at the end of the lines
 are required):
@@ -16,8 +16,8 @@ are required):
     # List of plugins
     # Supports `github_username/repo` or full git URLs
     set -g @tpm_plugins "              \
-      bruno-/tpm                       \
-      bruno-/tmux_pain_control         \
+      tmux-plugins/tpm                       \
+      tmux-plugins/tmux-pain-control         \
     "
     # Other examples:
     # github_username/plugin_name    \
@@ -53,15 +53,15 @@ After you press `prefix + I`, everything should be up to date.
 
 ### List of plugins
 
-- [pain control](https://github.com/bruno-/tmux_pain_control) - useful standard
+- [pain control](https://github.com/tmux-plugins/tmux-pain-control) - useful standard
   bindings for controlling panes
-- [goto session](https://github.com/bruno-/tmux_goto_session) - faster session
+- [goto session](https://github.com/tmux-plugins/tmux-goto-session) - faster session
   switching
-- [battery osx](https://github.com/bruno-/tmux_battery_osx) - battery status
+- [battery osx](https://github.com/tmux-plugins/tmux-battery-osx) - battery status
   for OSX in Tmux `status-right`
-- [logging](https://github.com/bruno-/tmux_logging) - easy logging and
+- [logging](https://github.com/tmux-plugins/tmux-logging) - easy logging and
   screen capturing
-- [online status](https://github.com/bruno-/tmux_online_status) - online status
+- [online status](https://github.com/tmux-plugins/tmux-online-status) - online status
   indicator in Tmux `status-right`. Useful when on flaky connection to see if
   you're online.
 
diff --git a/tests/expect_successful_plugin_download b/tests/expect_successful_plugin_download
index c421535..9a529c6 100755
--- a/tests/expect_successful_plugin_download
+++ b/tests/expect_successful_plugin_download
@@ -16,10 +16,10 @@ send "I"
 set timeout 15
 
 expect {
-  "Downloading bruno-/tmux_example_plugin" {
+  "Downloading tmux-plugins/tmux-example-plugin" {
 
     expect {
-      "bruno-/tmux_example_plugin download success" {
+      "tmux-plugins/tmux-example-plugin download success" {
 
         expect { "Done, press ENTER to continue" { exit } }
 
diff --git a/tests/test_plugin_installation.sh b/tests/test_plugin_installation.sh
index 38b14d4..ad172b9 100755
--- a/tests/test_plugin_installation.sh
+++ b/tests/test_plugin_installation.sh
@@ -6,7 +6,7 @@ source $CURRENT_DIR/helpers.sh
 
 test_plugin_installation() {
 	set_tmux_conf_helper <<- HERE
-	set -g @tpm_plugins "bruno-/tmux_example_plugin"
+	set -g @tpm_plugins "tmux-plugins/tmux-example-plugin"
 	run-shell "~/tpm/tpm"
 	HERE