diff --git a/doc/man/8/ceph.rst b/doc/man/8/ceph.rst
index bbadf7cb53c..fa3d126fb11 100644
--- a/doc/man/8/ceph.rst
+++ b/doc/man/8/ceph.rst
@@ -478,6 +478,11 @@ Usage::
 
 Subcommand ``create`` creates new osd (with optional UUID and ID).
 
+This command is DEPRECATED as of the Luminous release, and will be removed in
+a future release.
+
+Subcommand ``new`` should instead be used.
+
 Usage::
 
 	ceph osd create {<uuid>} {<id>}
diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index efce0ad180b..255e267b555 100644
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -769,10 +769,11 @@ COMMAND("osd lost " \
 	"name=sure,type=CephChoices,strings=--yes-i-really-mean-it,req=false", \
 	"mark osd as permanently lost. THIS DESTROYS DATA IF NO MORE REPLICAS EXIST, BE CAREFUL", \
 	"osd", "rw", "cli,rest")
-COMMAND("osd create " \
+COMMAND_WITH_FLAG("osd create " \
 	"name=uuid,type=CephUUID,req=false " \
 	"name=id,type=CephOsdName,req=false", \
-	"create new osd (with optional UUID and ID)", "osd", "rw", "cli,rest")
+	"create new osd (with optional UUID and ID)", "osd", "rw", "cli,rest",
+	FLAG(DEPRECATED))
 COMMAND("osd new " \
         "name=uuid,type=CephUUID,req=true " \
         "name=id,type=CephOsdName,req=false", \