diff --git a/pygit2/submodule.py b/pygit2/submodule.py
deleted file mode 100644
index 4b1ac10..0000000
--- a/pygit2/submodule.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2010-2015 The pygit2 contributors
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 2,
-# as published by the Free Software Foundation.
-#
-# In addition to the permissions in the GNU General Public License,
-# the authors give you unlimited permission to link the compiled
-# version of this file into combinations with other programs,
-# and to distribute those combinations without any restriction
-# coming from the use of this file.  (The General Public License
-# restrictions do apply in other respects; for example, they cover
-# modification of the file, and distribution when not linked into
-# a combined executable.)
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.  If not, write to
-# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-# Import from the future
-from __future__ import absolute_import
-
-# Import from pygit2
-from _pygit2 import Submodule as _Submodule
-
-from .ffi import ffi
-
-
-class Submodule(_Submodule):
-
-    def __init__(self, *args, **kwargs):
-        super(Submodule, self).__init__(*args, **kwargs)
-        self._common_init()
-
-    @classmethod
-    def _from_c(cls, ptr, owned):
-        cptr = ffi.new('git_submodule **')
-        cptr[0] = ptr
-        submodule = cls.__new__(cls)
-        super(cls, submodule)._from_c(bytes(ffi.buffer(cptr)[:]), owned)
-        submodule._common_init()
-        return submodule
-
-    def _common_init(self):
-        # Get the pointer as the contents of a buffer and store it for
-        # later access
-        submodule_cptr = ffi.new('git_submodule **')
-        ffi.buffer(submodule_cptr)[:] = self._pointer[:]
-        self._submodule = submodule_cptr[0]
-
-    def __repr__(self):
-        return "pygit2.Submodule(%r)" % self.name
diff --git a/src/submodule.c b/src/submodule.c
index 93b9775..b4f05fb 100644
--- a/src/submodule.c
+++ b/src/submodule.c
@@ -98,6 +98,15 @@ Submodule_branch__get__(Submodule *self)
     return to_unicode(branch, NULL, NULL);
 }
 
+PyObject *
+Submodule_repr(PyObject *self)
+{
+    Submodule *subm = (Submodule *)self;
+
+    return PyString_FromFormat("pygit2.Submodule(\"%s\")",
+        git_submodule_name(subm->submodule));
+}
+
 static void
 Submodule_dealloc(Submodule *self)
 {
@@ -131,7 +140,7 @@ PyTypeObject SubmoduleType = {
     0,                                         /* tp_getattr        */
     0,                                         /* tp_setattr        */
     0,                                         /* tp_compare        */
-    0,                                         /* tp_repr           */
+    Submodule_repr,                            /* tp_repr           */
     0,                                         /* tp_as_number      */
     0,                                         /* tp_as_sequence    */
     0,                                         /* tp_as_mapping     */