diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb
index b92a13f7..449e3efe 100644
--- a/lib/net/ldap.rb
+++ b/lib/net/ldap.rb
@@ -1394,9 +1394,9 @@ def search(args = {})
           false.to_ber,
           rfc2696_cookie.map{ |v| v.to_ber}.to_ber_sequence.to_s.to_ber
         ].to_ber_sequence if paged_searches_supported
-      controls = controls.to_ber_contextspecific(0)
+      controls = controls.empty? ? nil : controls.to_ber_contextspecific(0)
 
-      pkt = [next_msgid.to_ber, request, controls].to_ber_sequence
+      pkt = [next_msgid.to_ber, request, controls].compact.to_ber_sequence
       @conn.write pkt
 
       result_code = 0
diff --git a/net-ldap.gemspec b/net-ldap.gemspec
index 00a99e41..54aef697 100644
--- a/net-ldap.gemspec
+++ b/net-ldap.gemspec
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{net-ldap}
+  s.name = %q{prathe_net-ldap}
   s.version = "0.2.20110317223538"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=