diff --git a/debian/changelog b/debian/changelog
index beb9167..c5e335e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+feed2imap (1.1-1) experimental; urgency=low
+
+  * Team upload.
+
+  [ Cédric Boutillier ]
+  * debian/control: remove obsolete DM-Upload-Allowed flag
+  * use canonical URI in Vcs-* fields
+
+  [ Antonio Terceiro ]
+  * debian/watch: point to my location for new upstream version
+  * New upstream version, adds Ruby 1.9 support
+  * debian/control:
+    - bump dependency on ruby-feedparser to >= 0.8~1
+    - Change dependeny from transitional package librmail-ruby1.8 to
+      ruby-rubymail
+    - Bump Standards-Version to 3.9.4; no changes needed
+  * debian/ruby-tests.rb: load all tests but one that requires network
+
+ -- Antonio Terceiro <terceiro@debian.org>  Sun, 25 Aug 2013 18:36:13 -0300
+
 feed2imap (1.0-2) unstable; urgency=low
 
   * Switch to gem2deb packaging.
diff --git a/debian/control b/debian/control
index 9271856..e0db117 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,17 @@
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 Uploaders: Lucas Nussbaum <lucas@lucas-nussbaum.net>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), ruby-feedparser, librmail-ruby1.8
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.1), ruby-feedparser (>= 0.8-1~), ruby-rubymail
+Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/feed2imap.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/feed2imap.git;a=summary
 Homepage: http://home.gna.org/feed2imap/
-XS-Ruby-Versions: ruby1.8
+XS-Ruby-Versions: all
 
 Package: feed2imap
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8, librmail-ruby1.8, ruby-feedparser
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-feedparser (>= 0.8-1~), ruby-rubymail
 Suggests: imap-client, imap-server
 Description: feed aggregator (RSS/Atom) which puts items on a IMAP mail server
  Feed2Imap is an RSS/Atom feed aggregator. After Downloading
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index e0197c0..455f8f9 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,4 +1,2 @@
-$: << 'test' << 'lib' << '.'
-require 'test/tc_cache.rb'
-require 'test/tc_config.rb'
-require 'test/tc_mail.rb'
+tests = Dir.glob('test/tc_*.rb') - ['test/tc_httpfetcher.rb']
+tests.each { |t| require t }