diff --git a/docs/ntppool/tpl/manage/add.html b/docs/ntppool/tpl/manage/add.html
index db1bf84..7600ab9 100644
--- a/docs/ntppool/tpl/manage/add.html
+++ b/docs/ntppool/tpl/manage/add.html
@@ -15,16 +15,24 @@ Thanks for offering your server to the pool!<br /> Please verify the following i
 [% END %]
 
 <h4>Zones</h4>
+<form method="post" action="/manage/server/add">
 [% IF server.zones.size < 2 %]
-We couldn't determine which country your server is in, please tell us in the comments field!<br />
+We couldn't determine which country your server is in, 
+please select one explicitly!
+  <br />
+  <select name="explicit_zone">
+  <option></option>
+  [% FOR zone = all_zones %]
+  <option>[% zone.description %]</option>
+  [% END %]
+  </select>
+<br />
 [% END %]
 [% FOR zone = server.zones %]
 <a href="[% zone.url %]">[% zone.description %]</a>
 [% END %]
 
-</p>
 
-<form method="post" action="/manage/server/add">
 <input type="hidden" name="host" value="[% host | html %]">
 <h4>Comment</h4>
 <textarea name="comment" rows="6" cols="60">
diff --git a/lib/Bundle/NP.pm b/lib/Bundle/NP.pm
index 7a1a8c3..af35e21 100644
--- a/lib/Bundle/NP.pm
+++ b/lib/Bundle/NP.pm
@@ -88,6 +88,7 @@ Email::Simple::Creator
 Digest::HMAC_MD5
 Net::IP
 Net::DNS
+Net::IPv6Addr
 
 Test::Pod
 Pod::Coverage
diff --git a/lib/NP/Model.pm b/lib/NP/Model.pm
index 66f5d31..0f69761 100644
--- a/lib/NP/Model.pm
+++ b/lib/NP/Model.pm
@@ -185,7 +185,7 @@ __PACKAGE__->meta->setup(
 
   columns => [
     id             => { type => 'integer', not_null => 1 },
-    ip             => { type => 'varchar', default => '', length => 15, not_null => 1 },
+    ip             => { type => 'varchar', default => '', length => 40, not_null => 1 },
     user_id        => { type => 'integer', default => '', not_null => 1 },
     hostname       => { type => 'varchar', length => 255 },
     stratum        => { type => 'integer' },
diff --git a/lib/NP/Model/User.pm b/lib/NP/Model/User.pm
index f25433b..28947e9 100644
--- a/lib/NP/Model/User.pm
+++ b/lib/NP/Model/User.pm
@@ -31,9 +31,7 @@ sub servers {
               ],
           ],
         );
-    $s = [ map { $_->[1] }
-           sort { $a->[0]->bincomp('gt', $b->[0])  }
-           map { [ Net::IP->new($_->ip), $_] }
+    $s = [ sort { $a->ip cmp $b->ip  }
            @$s ];
     wantarray ? @$s : $s;
 } 
diff --git a/lib/NTPPool/Control/Manage.pm b/lib/NTPPool/Control/Manage.pm
index e80e1af..43799d2 100644
--- a/lib/NTPPool/Control/Manage.pm
+++ b/lib/NTPPool/Control/Manage.pm
@@ -10,6 +10,7 @@ use Email::Send 'SMTP';
 use Sys::Hostname qw(hostname);
 use Email::Date qw();
 use JSON::XS qw(encode_json);
+use Net::IPv6Addr;
 
 sub render {
     my $self = shift;
@@ -82,6 +83,15 @@ sub handle_add {
         $s->zones([]);
 
         $s->join_zone($_) for @{$server->{zones}};
+        if ($self->req_param('explicit_zone')) {
+            my $explicit_zone = NP::Model->zone->get_zones(query =>
+                [description =>  $self->req_param('explicit_zone')]);
+            $explicit_zone = $explicit_zone->[0];
+            do {
+	      $s->join_zone($explicit_zone);
+              $explicit_zone = $explicit_zone->parent;
+            }while($explicit_zone && $explicit_zone->dns);
+        }
         $s->add_logs
             ({ user_id => $self->user->id, 
                type    => 'create',
@@ -92,6 +102,9 @@ sub handle_add {
         return $self->redirect('/manage/servers#s-' . $s->ip);
     }
 
+    my @all_zones = NP::Model->zone->get_zones();
+    $self->tpl_param(all_zones => @all_zones);
+
     return OK, $self->evaluate_template('tpl/manage/add.html');
 }
 
@@ -100,11 +113,14 @@ sub get_server_info {
     my $host = $self->req_param('host');
     die "No hostname or IP\n" unless $host;
 
-    my $iaddr = gethostbyname $host;
-    die "Could not find the IP for $host\n" unless $iaddr;
-
     my %server;
-    $server{ip} = inet_ntoa($iaddr);
+    if(Net::IPv6Addr::ipv6_chkip($host)) {
+       $server{ip} = $host;
+    }else{
+       my $iaddr = gethostbyname $host;
+       die "Could not find the IP for $host\n" unless $iaddr;
+       $server{ip} = inet_ntoa($iaddr);
+    }
     $server{hostname} = $host if $host ne $server{ip};
 
     die "Bad IP address\n" if $server{ip} =~ m/^(127|10|192.168)\./;
@@ -119,9 +135,11 @@ sub get_server_info {
     warn "checking $host / $server{ip}";
     warn Data::Dumper->Dump([\%ntp]);
 
-    die "Didn't get an NTP response from $host\n" unless defined $ntp{Stratum};
-    die "Invalid stratum response from $host (Your server is in stratum $ntp{Stratum}).  Is your server configured properly? Is public access allowed?  If you just restarted your ntpd, then it might still be stabilizing the timesources - try again in 10-20 minutes.\n"
-      unless $ntp{Stratum} > 0 and $ntp{Stratum} < 6;
+    unless(Net::IPv6Addr::ipv6_chkip($server{ip})) {
+      die "Didn't get an NTP response from $host\n" unless defined $ntp{Stratum};
+      die "Invalid stratum response from $host (Your server is in stratum $ntp{Stratum}).  Is your server configured properly? Is public access allowed?  If you just restarted your ntpd, then it might still be stabilizing the timesources - try again in 10-20 minutes.\n"
+        unless $ntp{Stratum} > 0 and $ntp{Stratum} < 6;
+    }
 
     $server{ntp} = \%ntp;
 
@@ -144,7 +162,7 @@ sub req_server {
     my $self = shift;
     my $server_id = $self->req_param('server');
     my $server = NP::Model->server->fetch
-        (($server_id =~ m/\./ ? 'ip' : 'id') => $server_id);
+        (($server_id =~ m/[.:]/ ? 'ip' : 'id') => $server_id);
     return unless $server and $server->admin->id == $self->user->id;
     $server;
 }
diff --git a/pool b/pool
index f060e62..32e5abf 100755
--- a/pool
+++ b/pool
@@ -461,6 +462,7 @@ elsif ($cmd eq "zone") {
                FROM servers s, server_zones l 
                WHERE l.server_id = s.id AND l.zone_id = ? AND s.in_pool = 1 
                AND s.score_raw > 5
+               AND s.ip LIKE '%.%.%.%'
                and (s.deletion_on IS NULL OR s.deletion_on > DATE_ADD(NOW(), interval ? day))
               ], undef, $zone->id, NP::Model::Zone->deletion_grace_days);
 
diff --git a/sql/ntppool.update b/sql/ntppool.update
index 413a605..ade5c0a 100644
--- a/sql/ntppool.update
+++ b/sql/ntppool.update
@@ -269,7 +269,9 @@ alter table zone_server_counts
 #35
 alter table servers add key (score_ts);
 
-
+#36
+alter table servers
+  modify ip varchar(40) NOT NULL;