diff --git a/include/sys/socket.h b/include/sys/socket.h
index abb58215da5..5809e71136d 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -116,38 +116,38 @@
 
 /* Socket-level options */
 
-#define SO_DEBUG        0 /* Enables recording of debugging information (get/set).
+#define SO_ACCEPTCONN   0 /* Reports whether socket listening is enabled (get only).
                            * arg: pointer to integer containing a boolean value */
-#define SO_ACCEPTCONN   1 /* Reports whether socket listening is enabled (get only).
+#define SO_BROADCAST    1 /* Permits sending of broadcast messages (get/set).
                            * arg: pointer to integer containing a boolean value */
-#define SO_BROADCAST    2 /* Permits sending of broadcast messages (get/set).
+#define SO_DEBUG        2 /* Enables recording of debugging information (get/set).
                            * arg: pointer to integer containing a boolean value */
-#define SO_REUSEADDR    3 /* Allow reuse of local addresses (get/set)
+#define SO_DONTROUTE    3 /* Requests that outgoing messages bypass standard routing (get/set)
                            * arg: pointer to integer containing a boolean value */
-#define SO_KEEPALIVE    4 /* Keeps connections active by enabling the periodic transmission
+#define SO_ERROR        4 /* Reports and clears error status (get only).  arg: returns
+                           * an integer value */
+#define SO_KEEPALIVE    5 /* Keeps connections active by enabling the periodic transmission
                            * of messages (get/set).
                            * arg: pointer to integer containing a boolean value */
-#define SO_LINGER       5 /* Lingers on a close() if data is present (get/set)
+#define SO_LINGER       6 /* Lingers on a close() if data is present (get/set)
                            * arg: struct linger */
-#define SO_OOBINLINE    6 /* Leaves received out-of-band data (data marked urgent) inline
+#define SO_OOBINLINE    7 /* Leaves received out-of-band data (data marked urgent) inline
                            * (get/set) arg: pointer to integer containing a boolean value */
-#define SO_SNDBUF       7 /* Sets send buffer size. arg: integer value (get/set). */
 #define SO_RCVBUF       8 /* Sets receive buffer size. arg: integer value (get/set). */
-#define SO_ERROR        9 /* Reports and clears error status (get only).  arg: returns
-                           * an integer value */
-#define SO_TYPE        10 /* Reports the socket type (get only). return: int */
-#define SO_DONTROUTE   11 /* Requests that outgoing messages bypass standard routing (get/set)
-                           * arg: pointer to integer containing a boolean value */
-#define SO_RCVLOWAT    12 /* Sets the minimum number of bytes to process for socket input
+#define SO_RCVLOWAT     9 /* Sets the minimum number of bytes to process for socket input
                            * (get/set). arg: integer value */
-#define SO_RCVTIMEO    13 /* Sets the timeout value that specifies the maximum amount of time
+#define SO_RCVTIMEO    10 /* Sets the timeout value that specifies the maximum amount of time
                            * an input function waits until it completes (get/set).
                            * arg: struct timeval */
-#define SO_SNDLOWAT    14 /* Sets the minimum number of bytes to process for socket output
+#define SO_REUSEADDR   11 /* Allow reuse of local addresses (get/set)
+                           * arg: pointer to integer containing a boolean value */
+#define SO_SNDBUF      12 /* Sets send buffer size. arg: integer value (get/set). */
+#define SO_SNDLOWAT    13 /* Sets the minimum number of bytes to process for socket output
                            * (get/set). arg: integer value */
-#define SO_SNDTIMEO    15 /* Sets the timeout value specifying the amount of time that an
+#define SO_SNDTIMEO    14 /* Sets the timeout value specifying the amount of time that an
                            * output function blocks because flow control prevents data from
                            * being sent(get/set). arg: struct timeval */
+#define SO_TYPE        15 /* Reports the socket type (get only). return: int */
 
 /* Protocol-level socket options may begin with this value */
 
diff --git a/net/socket/socket.h b/net/socket/socket.h
index 0557709c08b..3c8eb02bc02 100644
--- a/net/socket/socket.h
+++ b/net/socket/socket.h
@@ -95,24 +95,24 @@
 
 /* These define bit positions for each socket option (see sys/socket.h) */
 
-#define _SO_DEBUG        _SO_BIT(SO_DEBUG)
 #define _SO_ACCEPTCONN   _SO_BIT(SO_ACCEPTCONN)
 #define _SO_BROADCAST    _SO_BIT(SO_BROADCAST)
-#define _SO_REUSEADDR    _SO_BIT(SO_REUSEADDR)
+#define _SO_DEBUG        _SO_BIT(SO_DEBUG)
+#define _SO_DONTROUTE    _SO_BIT(SO_DONTROUTE)
+#define _SO_ERROR        _SO_BIT(SO_ERROR)
 #define _SO_KEEPALIVE    _SO_BIT(SO_KEEPALIVE)
 #define _SO_LINGER       _SO_BIT(SO_LINGER)
 #define _SO_OOBINLINE    _SO_BIT(SO_OOBINLINE)
-#define _SO_SNDBUF       _SO_BIT(SO_SNDBUF)
 #define _SO_RCVBUF       _SO_BIT(SO_RCVBUF)
-#define _SO_ERROR        _SO_BIT(SO_ERROR)
-#define _SO_TYPE         _SO_BIT(SO_TYPE)
-#define _SO_DONTROUTE    _SO_BIT(SO_DONTROUTE)
 #define _SO_RCVLOWAT     _SO_BIT(SO_RCVLOWAT)
 #define _SO_RCVTIMEO     _SO_BIT(SO_RCVTIMEO)
+#define _SO_REUSEADDR    _SO_BIT(SO_REUSEADDR)
+#define _SO_SNDBUF       _SO_BIT(SO_SNDBUF)
 #define _SO_SNDLOWAT     _SO_BIT(SO_SNDLOWAT)
 #define _SO_SNDTIMEO     _SO_BIT(SO_SNDTIMEO)
+#define _SO_TYPE         _SO_BIT(SO_TYPE)
 
-/* This is the larget option value */
+/* This is the largest option value.  REVISIT: belongs in sys/socket.h */
 
 #define _SO_MAXOPT       (15)