diff --git a/index.go b/index.go
index b1542d5..289239d 100644
--- a/index.go
+++ b/index.go
@@ -19,7 +19,7 @@ type Index struct {
 type IndexEntry struct {
 	Ctime time.Time
 	Mtime time.Time
-	Mode  uint
+	Mode  Filemode
 	Uid   uint
 	Gid   uint
 	Size  uint
@@ -34,7 +34,7 @@ func newIndexEntryFromC(entry *C.git_index_entry) *IndexEntry {
 	return &IndexEntry{
 		time.Unix(int64(entry.ctime.seconds), int64(entry.ctime.nanoseconds)),
 		time.Unix(int64(entry.mtime.seconds), int64(entry.mtime.nanoseconds)),
-		uint(entry.mode),
+		Filemode(entry.mode),
 		uint(entry.uid),
 		uint(entry.gid),
 		uint(entry.file_size),
diff --git a/tree.go b/tree.go
index e5fe361..45de9f1 100644
--- a/tree.go
+++ b/tree.go
@@ -17,10 +17,10 @@ type Filemode int
 
 const (
 	FilemodeTree           Filemode = C.GIT_FILEMODE_TREE
-	FilemodeBlob                    = C.GIT_FILEMODE_BLOB
-	FilemodeBlobExecutable          = C.GIT_FILEMODE_BLOB_EXECUTABLE
-	FilemodeLink                    = C.GIT_FILEMODE_LINK
-	FilemodeCommit                  = C.GIT_FILEMODE_COMMIT
+	FilemodeBlob           Filemode = C.GIT_FILEMODE_BLOB
+	FilemodeBlobExecutable Filemode = C.GIT_FILEMODE_BLOB_EXECUTABLE
+	FilemodeLink           Filemode = C.GIT_FILEMODE_LINK
+	FilemodeCommit         Filemode = C.GIT_FILEMODE_COMMIT
 )
 
 type Tree struct {
@@ -32,7 +32,7 @@ type TreeEntry struct {
 	Name     string
 	Id       *Oid
 	Type     ObjectType
-	Filemode int
+	Filemode Filemode
 }
 
 func newTreeEntry(entry *C.git_tree_entry) *TreeEntry {
@@ -40,7 +40,7 @@ func newTreeEntry(entry *C.git_tree_entry) *TreeEntry {
 		C.GoString(C.git_tree_entry_name(entry)),
 		newOidFromC(C.git_tree_entry_id(entry)),
 		ObjectType(C.git_tree_entry_type(entry)),
-		int(C.git_tree_entry_filemode(entry)),
+		Filemode(C.git_tree_entry_filemode(entry)),
 	}
 }