diff --git a/Changes b/Changes
index 7f101a2..8dcf4e0 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for PGObject-Type-ByteString
 
+1.2.0	2017-05-16
+	Adds support for PGObject 2.x
 1.1.2   2016-12-04
         Fix copyright attribution in LICENSE (consistency)
 
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index a42ef17..74aad2e 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -39,6 +39,8 @@
 ^tmp
 \bTAGS$
 ^MYMETA.yml$
+^.travis.yml$
+^MYMETA.json$
 
 \bSu-[\d\.\_]+
 
diff --git a/lib/PGObject/Type/ByteString.pm b/lib/PGObject/Type/ByteString.pm
index 5a6e6ee..c99ace1 100644
--- a/lib/PGObject/Type/ByteString.pm
+++ b/lib/PGObject/Type/ByteString.pm
@@ -17,8 +17,7 @@ Version 1.1.2
 
 =cut
 
-our $VERSION = '1.1.2';
-
+our $VERSION = '1.2.0';
 
 =head1 SYNOPSIS
 
@@ -48,10 +47,16 @@ sub register {
     my $types = $args{types};
     $types = [ DBD::Pg::PG_BYTEA, 'bytea' ] unless defined $types and @$types;
     for my $type (@$types){
-        my $ret =
-            PGObject->register_type(registry => $registry, pg_type => $type,
-                                  perl_class => $self);
-        return $ret unless $ret;
+        if ($PGObject::VERSION =~ /^1\./){
+            my $ret =
+                PGObject->register_type(registry => $registry, pg_type => $type,
+                                      perl_class => $self);
+            return $ret unless $ret;
+        } else {
+            PGObject::Type::Registry->register_type(
+                 registry => $registry, dbtype => $type, apptype => $self
+            );
+        }
     }
     return 1;
 }
diff --git a/t/02-registration.t b/t/02-registration.t
index a362efe..04c81c7 100644
--- a/t/02-registration.t
+++ b/t/02-registration.t
@@ -24,7 +24,14 @@ ok(PGObject::Type::ByteString->register(registry => 'test',
                                'custom registry, mybytes registration'),
 ok(PGObject::Type::ByteString->register(registry => 'test'),
                                 'default types, custom registry');
-my $registry = PGObject::get_type_registry();
+my $registry;
+
+if ($PGObject::VERSION =~ /^1\./){
+    $registry = PGObject::get_type_registry();
+} else {
+    $registry = { map {$_ => PGObject::Type::Registry->inspect($_) } 
+                  qw(default test) };
+}
 for my $reg (qw(default test)){
     for my $type (PG_BYTEA, 'mybytes') {
         is($registry->{$reg}->{$type}, 'PGObject::Type::ByteString',