diff --git a/src/misc.go b/src/misc.go
index 2fccbf65..f5e263af 100644
--- a/src/misc.go
+++ b/src/misc.go
@@ -298,8 +298,8 @@ var regExtStrMap = map[string]string{
 	"rtf": "application/rtf",
 	"pdf": "application/pdf",
 
-    "apk": "application/vnd.android.package-archive",
-    "bin": "application/octet-stream",
+	"apk": "application/vnd.android.package-archive",
+	"bin": "application/octet-stream",
 
 	"docx?": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
 	"pptx?": "application/vnd.openxmlformats-officedocument.wordprocessingml.presentation",
diff --git a/src/push.go b/src/push.go
index a21e60f1..e72a712b 100644
--- a/src/push.go
+++ b/src/push.go
@@ -323,7 +323,7 @@ func (g *Commands) remoteMod(change *Change) (err error) {
 	coercedMimeKey, ok := g.coercedMimeKey()
 	if ok {
 		args.mimeKey = coercedMimeKey
-	} else if args.src != nil { // Infer it from the extension
+	} else if args.src != nil && !args.src.IsDir { // Infer it from the extension
 		args.mimeKey = filepath.Ext(args.src.Name)
 	}