diff --git a/CHANGELOG b/CHANGELOG
index b3f1f0cbd..30b5c4146 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,7 +9,7 @@ Changese between 2.2.3 and ...
 - document integration with the extended distribute/setuptools test commands
 - fix issue 140: propperly get the real functions
   of bound classmethods for setup/teardown_class
-
+- fix issue #141: switch from the deceased paste.pocoo.org to bpaste.net
 
 Changes between 2.2.2 and 2.2.3
 ----------------------------------------
diff --git a/_pytest/pastebin.py b/_pytest/pastebin.py
index 6369ee749..a73f259cb 100644
--- a/_pytest/pastebin.py
+++ b/_pytest/pastebin.py
@@ -2,7 +2,7 @@
 import py, sys
 
 class url:
-    base = "http://paste.pocoo.org"
+    base = "http://bpaste.net"
     xmlrpc = base + "/xmlrpc/"
     show = base + "/show/"