diff --git a/rockspec/luasql-mysql-cvs-1.rockspec b/rockspec/luasql-mysql-cvs-1.rockspec
index 183b748..37a9c6b 100644
--- a/rockspec/luasql-mysql-cvs-1.rockspec
+++ b/rockspec/luasql-mysql-cvs-1.rockspec
@@ -18,20 +18,17 @@ dependencies = {
 }
 external_dependencies = {
    MYSQL = {
-      header = "mysql/mysql.h"
+      header = "mysql.h"
    }
 }
 build = {
-   type = "make",
-   variables = {
-      T="mysql",
-      LIB_OPTION = "$(LIBFLAG) -L$(MYSQL_LIBDIR) -lmysqlclient -lz -lcrypt -lnsl -lm",
-      CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) -I$(MYSQL_INCDIR)/mysql"
-   },
-   build_variables = {
-      DRIVER_LIBS="",
-   },
-   install_variables = {
-      LUA_LIBDIR = "$(LIBDIR)",
+   type = "builtin",
+   modules = {
+     ["luasql.mysql"] = {
+       sources = { "src/luasql.c", "src/ls_mysql.c" },
+       libraries = { "mysqlclient" },
+       incdirs = { "$(MYSQL_INCDIR)" },
+       libdirs = { "$(MYSQL_LIBDIR)" }
+     }
    }
 }
diff --git a/rockspec/luasql-sqlite-cvs-1.rockspec b/rockspec/luasql-sqlite-cvs-1.rockspec
index 7f3d337..c8e915a 100644
--- a/rockspec/luasql-sqlite-cvs-1.rockspec
+++ b/rockspec/luasql-sqlite-cvs-1.rockspec
@@ -22,16 +22,13 @@ external_dependencies = {
    }
 }
 build = {
-   type = "make",
-   variables = {
-      T="sqlite",
-      LIB_OPTION = "$(LIBFLAG) -L$(SQLITE_LIBDIR) -lsqlite",
-      CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) -I$(SQLITE_INCDIR)"
-   },
-   build_variables = {
-      DRIVER_LIBS="",
-   },
-   install_variables = {
-      LUA_LIBDIR = "$(LIBDIR)",
+   type = "builtin",
+   modules = {
+     ["luasql.sqlite"] = {
+       sources = { "src/luasql.c", "src/ls_sqlite.c" },
+       libraries = { "sqlite" },
+       incdirs = { "$(SQLITE_INCDIR)" },
+       libdirs = { "$(SQLITE_LIBDIR)" }
+     }
    }
 }
diff --git a/rockspec/luasql-sqlite3-2.2.0-1.rockspec b/rockspec/luasql-sqlite3-2.2.0-1.rockspec
new file mode 100644
index 0000000..0221f18
--- /dev/null
+++ b/rockspec/luasql-sqlite3-2.2.0-1.rockspec
@@ -0,0 +1,34 @@
+package = "LuaSQL-SQLite3"
+version = "2.2.0-1"
+source = {
+  url = "http://cloud.github.com/downloads/keplerproject/luasql/luasql-2.2.0.tar.gz"
+}
+description = {
+   summary = "Database connectivity for Lua (SQLite3 driver)",
+   detailed = [[
+      LuaSQL is a simple interface from Lua to a DBMS. It enables a
+      Lua program to connect to databases, execute arbitrary SQL statements
+      and retrieve results in a row-by-row cursor fashion.
+   ]],
+   license = "MIT/X11",
+   homepage = "http://www.keplerproject.org/luasql/"
+}
+dependencies = {
+   "lua >= 5.1"
+}
+external_dependencies = {
+   SQLITE = {
+      header = "sqlite3.h"
+   }
+}
+build = {
+   type = "builtin",
+   modules = {
+     ["luasql.sqlite3"] = {
+       sources = { "src/luasql.c", "src/ls_sqlite3.c" },
+       libraries = { "sqlite3" },
+       incdirs = { "$(SQLITE_INCDIR)" },
+       libdirs = { "$(SQLITE_LIBDIR)" }
+     }
+   }
+}
diff --git a/rockspec/luasql-sqlite3-cvs-1.rockspec b/rockspec/luasql-sqlite3-cvs-1.rockspec
index 81b4041..a90b6e2 100644
--- a/rockspec/luasql-sqlite3-cvs-1.rockspec
+++ b/rockspec/luasql-sqlite3-cvs-1.rockspec
@@ -22,24 +22,13 @@ external_dependencies = {
    }
 }
 build = {
-   type = "make",
-   variables = {
-      T="sqlite3",
-      LIB_OPTION = "$(LIBFLAG) -L$(SQLITE_LIBDIR) -lsqlite3",
-      CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) -I$(SQLITE_INCDIR)"
-   },
-   build_variables = {
-      DRIVER_LIBS="",
-   },
-   install_variables = {
-      LUA_LIBDIR = "$(LIBDIR)",
-   },
-   platforms = {
-     win32 = {
-       variables = {
-         LIB_OPTION = "$(SQLITE_LIB) $(LUA_LIBDIR)\\lua5.1.lib",
-         CFLAGS = "$(CFLAGS) /I$(LUA_INCDIR) /I$(SQLITE_INCDIR)"
-       }
+   type = "builtin",
+   modules = {
+     ["luasql.sqlite3"] = {
+       sources = { "src/luasql.c", "src/ls_sqlite3.c" },
+       libraries = { "sqlite3" },
+       incdirs = { "$(SQLITE_INCDIR)" },
+       libdirs = { "$(SQLITE_LIBDIR)" }
      }
    }
 }