diff --git a/Makefile b/Makefile
index 1d711d1f..cef68cee 100644
--- a/Makefile
+++ b/Makefile
@@ -4,17 +4,21 @@ RUSTFLAGS += -L. --cfg debug -Z debug-info
 .PHONY: all
 all: postgres.dummy
 
-postgres.dummy: src/lib.rs src/message.rs src/types.rs src/error.rs
+postgres.dummy: src/lib.rs src/message.rs src/types.rs src/error.rs src/pool/mod.rs
 	$(RUSTC) $(RUSTFLAGS) --lib src/lib.rs --out-dir .
 	touch $@
 
 .PHONY: check
-check: check-postgres
+check: check-postgres check-pool
 
 check-postgres: postgres.dummy src/test.rs
 	$(RUSTC) $(RUSTFLAGS) --test src/test.rs -o $@
 	./$@
 
+check-pool: postgres.dummy src/pool/test.rs
+	$(RUSTC) $(RUSTFLAGS) --test src/pool/test.rs -o $@
+	./$@
+
 .PHONY: clean
 clean:
 	git clean -dfx
diff --git a/src/error.rs b/src/error.rs
index b5396aa1..0cf26796 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,7 +1,7 @@
 macro_rules! make_errors(
     ($($code:pat => $error:ident),+) => (
         // TODO: Get rid of this module when mozilla/rust#4375 is fixed
-        mod hack {
+        pub mod hack {
             #[deriving(ToStr, Eq)]
             pub enum PostgresSqlState {
                 $($error,)+
diff --git a/src/lib.rs b/src/lib.rs
index 33124b78..6e043025 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -57,9 +57,10 @@ use message::{RowDescriptionEntry, WriteMessage, ReadMessage};
 
 use types::{PostgresType, ToSql, FromSql};
 
-mod error;
+pub mod error;
+pub mod pool;
 mod message;
-mod types;
+pub mod types;
 
 pub trait PostgresNoticeHandler {
     fn handle(&mut self, notice: PostgresDbError);
diff --git a/src/pool/mod.rs b/src/pool/mod.rs
new file mode 100644
index 00000000..20c964f5
--- /dev/null
+++ b/src/pool/mod.rs
@@ -0,0 +1,109 @@
+extern mod extra;
+
+use extra::arc::MutexArc;
+use std::cell::Cell;
+
+use super::{PostgresConnection, PostgresConnectError};
+
+pub struct PostgresConnectionPoolConfig {
+    initial_size: uint,
+    min_size: uint,
+    max_size: uint
+}
+
+impl PostgresConnectionPoolConfig {
+    fn validate(&self) {
+        assert!(self.initial_size >= self.min_size);
+        assert!(self.initial_size <= self.max_size);
+    }
+}
+
+pub static DEFAULT_CONFIG: PostgresConnectionPoolConfig =
+    PostgresConnectionPoolConfig {
+        initial_size: 3,
+        min_size: 3,
+        max_size: 15
+    };
+
+struct InnerConnectionPool {
+    url: ~str,
+    config: PostgresConnectionPoolConfig,
+    pool: ~[PostgresConnection],
+    size: uint,
+}
+
+impl InnerConnectionPool {
+    fn new_connection(&mut self) -> Option<PostgresConnectError> {
+        match PostgresConnection::try_connect(self.url) {
+            Ok(conn) => {
+                self.pool.push(conn);
+                self.size += 1;
+                None
+            }
+            Err(err) => Some(err)
+        }
+    }
+}
+
+// Should be a newtype, but blocked by mozilla/rust#9155
+pub struct PostgresConnectionPool {
+    pool: MutexArc<InnerConnectionPool>
+}
+
+impl PostgresConnectionPool {
+    pub fn new(url: &str, config: PostgresConnectionPoolConfig)
+            -> Result<PostgresConnectionPool, PostgresConnectError> {
+        config.validate();
+
+        let mut pool = InnerConnectionPool {
+            url: url.to_owned(),
+            config: config,
+            pool: ~[],
+            size: 0,
+        };
+
+        while pool.size < pool.config.initial_size {
+            match pool.new_connection() {
+                None => (),
+                Some(err) => return Err(err)
+            }
+        }
+
+        Ok(PostgresConnectionPool {
+            pool: MutexArc::new(pool)
+        })
+    }
+
+    pub fn try_with_connection<T>(&mut self,
+                                  blk: &fn(&PostgresConnection) -> T)
+            -> Result<T, PostgresConnectError> {
+        let conn = unsafe {
+            do self.pool.unsafe_access_cond |pool, cond| {
+                while pool.pool.is_empty() {
+                    cond.wait();
+                }
+
+                pool.pool.pop()
+            }
+        };
+
+        let ret = blk(&conn);
+
+        let conn = Cell::new(conn);
+        unsafe {
+            do self.pool.unsafe_access |pool| {
+                pool.pool.push(conn.take());
+            }
+        }
+
+        Ok(ret)
+    }
+
+    pub fn with_connection<T>(&mut self, blk: &fn(&PostgresConnection) -> T)
+            -> T {
+        match self.try_with_connection(blk) {
+            Ok(ret) => ret,
+            Err(err) => fail!("Error getting connection: %s", err.to_str())
+        }
+    }
+}
diff --git a/src/pool/test.rs b/src/pool/test.rs
new file mode 100644
index 00000000..00d23f37
--- /dev/null
+++ b/src/pool/test.rs
@@ -0,0 +1,14 @@
+extern mod postgres;
+
+use postgres::pool;
+use postgres::pool::{PostgresConnectionPool};
+
+#[test]
+fn test_pool() {
+    let mut pool = PostgresConnectionPool::new("postgres://postgres@localhost",
+                                               pool::DEFAULT_CONFIG).unwrap();
+
+    do pool.with_connection |_conn| {
+
+    }
+}