Index: uspace/app/bdsh/README
===================================================================
--- uspace/app/bdsh/README	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
+++ uspace/app/bdsh/README	(revision 627915185156b9a091cd583567c85c304d1d39d7)
@@ -58,10 +58,10 @@
 
 /* Types for module command entry and help */
-typedef int * (* mod_entry_t)(char **);
-typedef void * (* mod_help_t)(unsigned int);
+typedef int (* mod_entry_t)(char **);
+typedef void (* mod_help_t)(unsigned int);
 
 /* Built-in commands need to be able to modify cliuser_t */
-typedef int * (* builtin_entry_t)(char **, cliuser_t *);
-typedef void * (* builtin_help_t)(unsigned int);
+typedef int (* builtin_entry_t)(char **, cliuser_t *);
+typedef void (* builtin_help_t)(unsigned int);
 
 As you can see, both modular and builtin commands expect an array of
@@ -154,7 +154,5 @@
 2: Change your "usage()" command as shown:
      -- void usage(...)
-     ++ void * help_cmd_foo(unsigned int level)
-     -- return;
-     ++ retrn CMD_VOID;
+     ++ void help_cmd_foo(unsigned int level)
 
      'level' is either 0 or 1, indicating the level of help requested.
@@ -164,5 +162,5 @@
 3: Change the programs "main()" as shown:
      -- int main(int argc, char **argv)
-     ++ int * cmd_foo(char **argv)
+     ++ int cmd_foo(char **argv)
      -- return 1;
      ++ return CMD_FAILURE;
@@ -170,14 +168,4 @@
      ++ return CMD_SUCCESS;
 
-     If main() returns an int that is not 1 or 0 (e.g. 127), cast it as
-     such:
-
-     -- return 127;
-     ++ return (int *) 127;
-
-     NOTE: _ONLY_ the main and help entry points need to return int * or
-     void *, respectively. Also take note that argc has changed. The type
-     for entry points may soon change.
-
      NOTE: If main is void, you'll need to change it and ensure that its
      expecting an array of arguments, even if they'll never be read or
@@ -185,9 +173,5 @@
 
      -- void main(void)
-     ++ int * cmd_foo(char **argv)
-
-     Similararly, do not try to return CMD_VOID within the modules main
-     entry point. If somehow you escape the compiler yelling at you, you
-     will surely see pretty blue and yellow fireworks once its reached.
+     ++ int cmd_foo(char **argv)
 
 4: Don't expose more than the entry and help points:
Index: uspace/app/bdsh/cmds/mknewcmd
===================================================================
--- uspace/app/bdsh/cmds/mknewcmd	(revision 809813db075eaa34bd76f54b7422e709e04072eb)
+++ uspace/app/bdsh/cmds/mknewcmd	(revision 627915185156b9a091cd583567c85c304d1d39d7)
@@ -171,9 +171,9 @@
 
 /* Dispays help for ${CMDNAME} in various levels */
-void * ${HELPENTRY}(unsigned int level)
+void ${HELPENTRY}(unsigned int level)
 {
 	printf("This is the %s help for '%s'.\n",
 		level ? EXT_HELP : SHORT_HELP, cmdname);
-	return CMD_VOID;
+	return;
 }
 
@@ -181,10 +181,10 @@
 	[ "${CMDTYPE}" = "module" ] && cat << EOF >> ${OUTDIR}/${CMDNAME}.c
 /* Main entry point for ${CMDNAME}, accepts an array of arguments */
-int * ${CMDENTRY}(char **argv)
+int ${CMDENTRY}(char **argv)
 EOF
 	[ "${CMDTYPE}" = "builtin" ] && cat << EOF >> ${OUTDIR}/${CMDNAME}.c
 /* Main entry point for ${CMDNAME}, accepts an array of arguments and a
  * pointer to the cliuser_t structure */
-int * ${CMDENTRY}(char **argv, cliuser_t *usr)
+int ${CMDENTRY}(char **argv, cliuser_t *usr)
 EOF
 	cat << EOF >> ${OUTDIR}/${CMDNAME}.c