diff --git a/jbuild b/jbuild
deleted file mode 100644
index a76acb49..00000000
--- a/jbuild
+++ /dev/null
@@ -1,5 +0,0 @@
-(jbuild_version 1)
-
-(install
- ((section toplevel)
-  (files   (topkg-jbuilder))))
diff --git a/pkg/pkg.ml b/pkg/pkg.ml
index c92adcba..11f1ecfd 100644
--- a/pkg/pkg.ml
+++ b/pkg/pkg.ml
@@ -1,7 +1,9 @@
-#!/usr/bin/env ocaml
-#use "./topkg-jbuilder"
+#use "topfind"
+#require "topkg-jbuilder"
+
+open Topkg
 
 let () =
-  Pkg.describe "jbuilder"
+  Topkg_jbuilder.describe ()
     ~readmes: [ Pkg.std_file "README.org"     ]
     ~licenses:[ Pkg.std_file "LICENSE.txt"    ]
diff --git a/topkg-jbuilder b/topkg-jbuilder
deleted file mode 100644
index 7c4e1494..00000000
--- a/topkg-jbuilder
+++ /dev/null
@@ -1,57 +0,0 @@
-(* -*- tuareg -*- *)
-#use "topfind"
-#require "topkg"
-
-open Topkg
-
-module Pkg = struct
-  include Pkg
-
-  let build
-        ?(cmd=fun c os _files ->
-          let jbuilder = Conf.tool "jbuilder" os in
-          OS.Cmd.run @@ Cmd.(jbuilder % "build" % "-p" % Conf.pkg_name c))
-        ?(clean=fun os ~build_dir ->
-          let rm = Conf.tool "rm" os in
-          let find = Conf.tool "find" os in
-          OS.Cmd.run @@ Cmd.(rm % "-rf" % build_dir) >>= fun () ->
-          OS.Cmd.run @@ Cmd.(find % "." % "-name" % ".merlin" % "-delete"))
-    =
-    Pkg.build ~cmd ~clean
-
-  let opam_files () =
-    Sys.readdir "."
-    |> Array.to_list
-    |> List.filter (String.is_suffix ~affix:".opam")
-    |> List.map (Pkg.opam_file ~lint_deps_excluding:None)
-
-  let describe
-    ?delegate
-    ?readmes
-    ?licenses
-    ?change_logs
-    ?(metas=[])
-    ?(opams=opam_files ())
-    ?lint_files
-    ?lint_custom
-    ?distrib
-    ?publish
-    ?(build=build ())
-    name
-    =
-    describe
-      ?delegate
-      ?readmes
-      ?licenses
-      ?change_logs
-      ~metas
-      ~opams
-      ?lint_files
-      ?lint_custom
-      ?distrib
-      ?publish
-      ~build
-      name
-    @@ fun c ->
-    Ok [ (*Pkg.test "jbuilder" ~auto:false ~args:Cmd.(empty % "runtest" % "-p" % Conf.pkg_name c)*) ]
-end