diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc
index d1bf193ed9..21a8fdeed4 100644
--- a/libs/ardour/luabindings.cc
+++ b/libs/ardour/luabindings.cc
@@ -323,6 +323,31 @@ LuaBindings::common (lua_State* L)
 		.addFunction ("name", &SessionObject::name)
 		.endClass ()
 
+		.beginWSPtrClass <Port> ("Port")
+		.addFunction ("name", &Port::name)
+		.addFunction ("pretty_name", &Port::pretty_name)
+		.addFunction ("receives_input", &Port::receives_input)
+		.addFunction ("sends_output", &Port::sends_output)
+		.addFunction ("connected", &Port::connected)
+		.addFunction ("disconnect_all", &Port::disconnect_all)
+		.addFunction ("connected_to_name", (bool (Port::*)(std::string const &)const)&Port::connected_to)
+		.addFunction ("connect_by_name", (int (Port::*)(std::string const &))&Port::connect)
+		.addFunction ("disconnect_by_name", (int (Port::*)(std::string const &))&Port::disconnect)
+		.addFunction ("connected_to", (bool (Port::*)(Port*)const)&Port::connected_to)
+		.addFunction ("connect", (int (Port::*)(Port*))&Port::connect)
+		.addFunction ("disconnect", (int (Port::*)(Port*))&Port::disconnect)
+		.endClass ()
+
+		.beginWSPtrClass <PortSet> ("PortSet")
+		.addFunction ("num_ports", (size_t (PortSet::*)(DataType)const)&PortSet::num_ports)
+		.addFunction ("add", &PortSet::add)
+		.addFunction ("remove", &PortSet::remove)
+		.addFunction ("port", (boost::shared_ptr<Port> (PortSet::*)(DataType, size_t)const)&PortSet::port)
+		.addFunction ("contains", &PortSet::contains)
+		.addFunction ("clear", &PortSet::clear)
+		.addFunction ("empty", &PortSet::empty)
+		.endClass ()
+
 		.deriveWSPtrClass <IO, SessionObject> ("IO")
 		.addFunction ("active", &IO::active)
 		.addFunction ("add_port", &IO::add_port)
@@ -330,6 +355,12 @@ LuaBindings::common (lua_State* L)
 		.addFunction ("connect", &IO::connect)
 		.addFunction ("disconnect", (int (IO::*)(boost::shared_ptr<Port>, std::string, void *))&IO::disconnect)
 		.addFunction ("physically_connected", &IO::physically_connected)
+		.addFunction ("has_port", &IO::has_port)
+		.addFunction ("nth", &IO::nth)
+		.addFunction ("audio", &IO::audio)
+		.addFunction ("midi", &IO::midi)
+		.addFunction ("port_by_name", &IO::nth)
+		.addFunction ("n_ports", &IO::n_ports)
 		.endClass ()
 
 		.deriveWSPtrClass <Route, SessionObject> ("Route")
@@ -617,10 +648,6 @@ LuaBindings::common (lua_State* L)
 		.endClass ()
 #endif
 
-	// typedef std::set<boost::weak_ptr<AudioPort> > PortSet
-		.beginStdSet <boost::weak_ptr<AudioPort> > ("WeakPortSet")
-		.endClass ()
-
 	// std::list<boost::weak_ptr<Source> >
 		.beginConstStdList <boost::weak_ptr<Source> > ("WeakSourceList")
 		.endClass ()