diff --git a/src/conf.cpp b/src/conf.cpp
index 16f11782..f223c27d 100644
--- a/src/conf.cpp
+++ b/src/conf.cpp
@@ -623,19 +623,43 @@ struct ctx_parm config_parms[] = {
     0, PARM_TYP_STRING, PARM_CAT_16, WEBUI_LEVEL_ADVANCED},
 
     {
-    "track_auto",
+    "ptz_auto_track",
     "############################################################\n"
-    "# Tracking configuration parameters\n"
+    "# Pan, Tilt, Zoom configuration parameters\n"
     "############################################################\n\n"
     "# Enable auto tracking",
     0, PARM_TYP_BOOL, PARM_CAT_17, WEBUI_LEVEL_LIMITED },
     {
-    "track_move_wait",
-    "# Delay to wait for after tracking movement as number of picture frames.",
+    "ptz_wait",
+    "# Frame count to delay after a PTZ action.",
     0, PARM_TYP_INT, PARM_CAT_17, WEBUI_LEVEL_LIMITED },
     {
-    "track_move_command",
-    "# Command to execute to move a camera in generic tracking mode",
+    "ptz_move_track",
+    "# Command to execute for auto tracking ",
+    0, PARM_TYP_STRING, PARM_CAT_17, WEBUI_LEVEL_LIMITED },
+    {
+    "ptz_pan_left",
+    "# Command to execute for moving camera left",
+    0, PARM_TYP_STRING, PARM_CAT_17, WEBUI_LEVEL_LIMITED },
+    {
+    "ptz_pan_right",
+    "# Command to execute for moving camera right ",
+    0, PARM_TYP_STRING, PARM_CAT_17, WEBUI_LEVEL_LIMITED },
+    {
+    "ptz_tilt_up",
+    "# Command to execute for moving camera up ",
+    0, PARM_TYP_STRING, PARM_CAT_17, WEBUI_LEVEL_LIMITED },
+    {
+    "ptz_tilt_down",
+    "# Command to execute for moving camera down ",
+    0, PARM_TYP_STRING, PARM_CAT_17, WEBUI_LEVEL_LIMITED },
+    {
+    "ptz_zoom_in",
+    "# Command to execute for zooming the camera in ",
+    0, PARM_TYP_STRING, PARM_CAT_17, WEBUI_LEVEL_LIMITED },
+    {
+    "ptz_zoom_out",
+    "# Command to execute for zooming camera out ",
     0, PARM_TYP_STRING, PARM_CAT_17, WEBUI_LEVEL_LIMITED },
     {
     "camera",
@@ -2983,49 +3007,127 @@ static void conf_edit_sql_query(struct ctx_cam *cam, std::string &parm, enum PAR
     MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","sql_query",_("sql_query"));
 }
 
-static void conf_edit_track_auto(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
+static void conf_edit_ptz_auto_track(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
 {
     if (pact == PARM_ACT_DFLT){
-        cam->conf->track_auto = FALSE;
+        cam->conf->ptz_auto_track = FALSE;
     } else if (pact == PARM_ACT_SET){
-        conf_edit_set_bool(cam->conf->track_auto, parm);
+        conf_edit_set_bool(cam->conf->ptz_auto_track, parm);
     } else if (pact == PARM_ACT_GET){
-        conf_edit_get_bool(parm, cam->conf->track_auto);
+        conf_edit_get_bool(parm, cam->conf->ptz_auto_track);
     }
     return;
-    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","track_auto",_("track_auto"));
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_auto_track",_("ptz_auto_track"));
 }
 
-static void conf_edit_track_move_wait(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
+static void conf_edit_ptz_wait(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
 {
     int parm_in;
     if (pact == PARM_ACT_DFLT){
-        cam->conf->track_move_wait = 0;
+        cam->conf->ptz_wait = 0;
     } else if (pact == PARM_ACT_SET){
         parm_in = atoi(parm.c_str());
         if ((parm_in < 0) || (parm_in > 2147483647)) {
-            MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid track_move_wait %d"),parm_in);
+            MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Invalid ptz_wait %d"),parm_in);
         } else {
-            cam->conf->track_move_wait = parm_in;
+            cam->conf->ptz_wait = parm_in;
         }
     } else if (pact == PARM_ACT_GET){
-        parm = std::to_string(cam->conf->track_move_wait);
+        parm = std::to_string(cam->conf->ptz_wait);
     }
     return;
-    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","track_move_wait",_("track_move_wait"));
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_wait",_("ptz_wait"));
 }
 
-static void conf_edit_track_move_command(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
+static void conf_edit_ptz_move_track(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
 {
     if (pact == PARM_ACT_DFLT) {
-        cam->conf->track_move_command = "";
+        cam->conf->ptz_move_track = "";
     } else if (pact == PARM_ACT_SET){
-        cam->conf->track_move_command = parm;
+        cam->conf->ptz_move_track = parm;
     } else if (pact == PARM_ACT_GET){
-        parm = cam->conf->track_move_command;
+        parm = cam->conf->ptz_move_track;
     }
     return;
-    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","track_move_command",_("track_move_command"));
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_move_track",_("ptz_move_track"));
+}
+
+static void conf_edit_ptz_pan_left(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
+{
+    if (pact == PARM_ACT_DFLT) {
+        cam->conf->ptz_pan_left = "";
+    } else if (pact == PARM_ACT_SET){
+        cam->conf->ptz_pan_left = parm;
+    } else if (pact == PARM_ACT_GET){
+        parm = cam->conf->ptz_pan_left;
+    }
+    return;
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_pan_left",_("ptz_pan_left"));
+}
+
+static void conf_edit_ptz_pan_right(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
+{
+    if (pact == PARM_ACT_DFLT) {
+        cam->conf->ptz_pan_right = "";
+    } else if (pact == PARM_ACT_SET){
+        cam->conf->ptz_pan_right = parm;
+    } else if (pact == PARM_ACT_GET){
+        parm = cam->conf->ptz_pan_right;
+    }
+    return;
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_pan_right",_("ptz_pan_right"));
+}
+
+static void conf_edit_ptz_tilt_up(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
+{
+    if (pact == PARM_ACT_DFLT) {
+        cam->conf->ptz_tilt_up = "";
+    } else if (pact == PARM_ACT_SET){
+        cam->conf->ptz_tilt_up = parm;
+    } else if (pact == PARM_ACT_GET){
+        parm = cam->conf->ptz_tilt_up;
+    }
+    return;
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_tilt_up",_("ptz_tilt_up"));
+}
+
+static void conf_edit_ptz_tilt_down(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
+{
+    if (pact == PARM_ACT_DFLT) {
+        cam->conf->ptz_tilt_down = "";
+    } else if (pact == PARM_ACT_SET){
+        cam->conf->ptz_tilt_down = parm;
+    } else if (pact == PARM_ACT_GET){
+        parm = cam->conf->ptz_tilt_down;
+    }
+    return;
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_tilt_down",_("ptz_tilt_down"));
+}
+
+static void conf_edit_ptz_zoom_in(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
+{
+    if (pact == PARM_ACT_DFLT) {
+        cam->conf->ptz_zoom_in = "";
+    } else if (pact == PARM_ACT_SET){
+        cam->conf->ptz_zoom_in = parm;
+    } else if (pact == PARM_ACT_GET){
+        parm = cam->conf->ptz_zoom_in;
+    }
+    return;
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_zoom_in",_("ptz_zoom_in"));
+}
+
+static void conf_edit_ptz_zoom_out(struct ctx_cam *cam, std::string &parm, enum PARM_ACT pact)
+{
+    if (pact == PARM_ACT_DFLT) {
+        cam->conf->ptz_zoom_out = "";
+    } else if (pact == PARM_ACT_SET){
+        cam->conf->ptz_zoom_out = parm;
+    } else if (pact == PARM_ACT_GET){
+        parm = cam->conf->ptz_zoom_out;
+    }
+    return;
+    MOTION_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","ptz_zoom_out",_("ptz_zoom_out"));
 }
 
 /* Application level parameters */
@@ -3283,9 +3385,15 @@ static void conf_edit_cat16(struct ctx_cam *cam, std::string parm_nm
 static void conf_edit_cat17(struct ctx_cam *cam, std::string parm_nm
         , std::string &parm_val, enum PARM_ACT pact)
 {
-    if (parm_nm == "track_auto"){                     conf_edit_track_auto(cam, parm_val, pact);
-    } else if (parm_nm == "track_move_wait"){         conf_edit_track_move_wait(cam, parm_val, pact);
-    } else if (parm_nm == "track_move_command"){      conf_edit_track_move_command(cam, parm_val, pact);
+    if (parm_nm == "ptz_auto_track"){           conf_edit_ptz_auto_track(cam, parm_val, pact);
+    } else if (parm_nm == "ptz_wait"){          conf_edit_ptz_wait(cam, parm_val, pact);
+    } else if (parm_nm == "ptz_move_track"){    conf_edit_ptz_move_track(cam, parm_val, pact);
+    } else if (parm_nm == "ptz_pan_left"){      conf_edit_ptz_pan_left(cam, parm_val, pact);
+    } else if (parm_nm == "ptz_pan_right"){     conf_edit_ptz_pan_right(cam, parm_val, pact);
+    } else if (parm_nm == "ptz_tilt_up"){       conf_edit_ptz_tilt_up(cam, parm_val, pact);
+    } else if (parm_nm == "ptz_tilt_down"){     conf_edit_ptz_tilt_down(cam, parm_val, pact);
+    } else if (parm_nm == "ptz_zoom_in"){       conf_edit_ptz_zoom_in(cam, parm_val, pact);
+    } else if (parm_nm == "ptz_zoom_out"){      conf_edit_ptz_zoom_out(cam, parm_val, pact);
     }
 
 }
diff --git a/src/conf.hpp b/src/conf.hpp
index 08a3b51e..f067897a 100644
--- a/src/conf.hpp
+++ b/src/conf.hpp
@@ -178,9 +178,16 @@
         std::string     sql_query_stop;
         std::string     sql_query;
 
-        int             track_auto;
-        int             track_move_wait;
-        std::string     track_move_command;
+        int             ptz_auto_track;         /* Bool to enable auto tracking */
+        int             ptz_wait;               /* Frames to wait after a PTZ move */
+        std::string     ptz_move_track;         /* Auto tracking command */
+        std::string     ptz_pan_left;           /* Pan left command */
+        std::string     ptz_pan_right;          /* Pan right command */
+        std::string     ptz_tilt_up;            /* Tilt up command */
+        std::string     ptz_tilt_down;          /* Tilt down command */
+        std::string     ptz_zoom_in;            /* Zoom in command */
+        std::string     ptz_zoom_out;           /* Zoom out command */
+
     };
 
     /* Categories for he edits and display on web interface*/
diff --git a/src/motion_loop.cpp b/src/motion_loop.cpp
index 41b8ebf4..9f2edd12 100644
--- a/src/motion_loop.cpp
+++ b/src/motion_loop.cpp
@@ -210,11 +210,11 @@ static void mlp_detected_trigger(struct ctx_cam *cam, struct ctx_image_data *img
 static void mlp_track_center(struct ctx_cam *cam)
 {
 
-    if ((cam->conf->track_auto) && (cam->conf->track_move_command != "")) {
+    if ((cam->conf->ptz_auto_track) && (cam->conf->ptz_move_track != "")) {
         cam->track_posx = 0;
         cam->track_posy = 0;
-        util_exec_command(cam, cam->conf->track_move_command.c_str(), NULL, 0);
-        cam->frame_skip = cam->conf->track_move_wait;
+        util_exec_command(cam, cam->conf->ptz_move_track.c_str(), NULL, 0);
+        cam->frame_skip = cam->conf->ptz_wait;
     }
 
 }
@@ -222,11 +222,11 @@ static void mlp_track_center(struct ctx_cam *cam)
 static void mlp_track_move(struct ctx_cam *cam, struct ctx_coord *cent)
 {
 
-    if ((cam->conf->track_auto) && (cam->conf->track_move_command != "")) {
+    if ((cam->conf->ptz_auto_track) && (cam->conf->ptz_move_track != "")) {
             cam->track_posx += cent->x;
             cam->track_posy += cent->y;
-            util_exec_command(cam, cam->conf->track_move_command.c_str(), NULL, 0);
-            cam->frame_skip = cam->conf->track_move_wait;
+            util_exec_command(cam, cam->conf->ptz_move_track.c_str(), NULL, 0);
+            cam->frame_skip = cam->conf->ptz_wait;
     }
 }
 
diff --git a/src/webu_html.cpp b/src/webu_html.cpp
index 39af05c4..6ba6d817 100644
--- a/src/webu_html.cpp
+++ b/src/webu_html.cpp
@@ -612,13 +612,39 @@ static void webu_html_script_camera_click(struct webui_ctx *webui)
         "      if (gIndexCam > 0) {\n"
         "        camid = pData['cameras'][index_cam].id;\n"
         "        html_preview += \"<tr><td>&nbsp&nbsp</td><td>&nbsp&nbsp</td></tr>\\n\";\n"
-        "        html_preview += \"<tr><td></td><td><button class='arrow up'></button></td></tr>\\n\";\n"
-        "        html_preview += \"<tr><td><button class='arrow left'></button></td><td></td>\\n\";\n"
-        "        html_preview += \"<td><button class='arrow right'></button></td><td>&nbsp&nbsp</td><tr>\\n\";\n"
-        "        html_preview += \"<tr><td></td><td><button class='arrow down'></button></td></tr>\\n\";\n"
+
+        "        html_preview += \"<tr><td></td><td><button \\n\";\n"
+        "        html_preview += \"onclick=\\\"action_ptz('tilt_up');\\\" \\n\";\n"
+        "        html_preview += \"class=\\\"arrow up\\\" \\n\";\n"
+        "        html_preview += \"></button></td></tr> \\n\";\n"
+
+        "        html_preview += \"<tr><td><button \\n\";\n"
+        "        html_preview += \"onclick=\\\"action_ptz('pan_left');\\\" \\n\";\n"
+        "        html_preview += \"class=\\\"arrow left\\\" \\n\";\n"
+        "        html_preview += \"></button></td><td></td> \\n\";\n"
+
+        "        html_preview += \"<td><button \\n\";\n"
+        "        html_preview += \"onclick=\\\"action_ptz('pan_right');\\\" \\n\";\n"
+        "        html_preview += \"class=\\\"arrow right\\\" \\n\";\n"
+        "        html_preview += \"></button></td><td>&nbsp&nbsp</td></tr> \\n\";\n"
+
+        "        html_preview += \"<tr><td></td><td><button \\n\";\n"
+        "        html_preview += \"onclick=\\\"action_ptz('tilt_down');\\\" \\n\";\n"
+        "        html_preview += \"class=\\\"arrow down\\\" \\n\";\n"
+        "        html_preview += \"></button></td></tr> \\n\";\n"
+
         "        html_preview += \"<tr><td>&nbsp&nbsp</td><td>&nbsp&nbsp</td></tr>\\n\";\n"
-        "        html_preview += \"<tr><td></td><td><button class='zoombtn'>+</button></td></tr>\\n\";\n"
-        "        html_preview += \"<tr><td></td><td><button class='zoombtn'>-</button></td></tr>\\n\";\n"
+
+        "        html_preview += \"<tr><td></td><td><button \\n\";\n"
+        "        html_preview += \"onclick=\\\"action_ptz('zoom_in');\\\" \\n\";\n"
+        "        html_preview += \"class=\\\"zoombtn\\\" \\n\";\n"
+        "        html_preview += \">+</button></td></tr> \\n\";\n"
+
+        "        html_preview += \"<tr><td></td><td><button \\n\";\n"
+        "        html_preview += \"onclick=\\\"action_ptz('zoom_out');\\\" \\n\";\n"
+        "        html_preview += \"class=\\\"zoombtn\\\" \\n\";\n"
+        "        html_preview += \">-</button></td></tr> \\n\";\n"
+
         "        html_preview += \"<tr><td>&nbsp&nbsp</td><td>&nbsp&nbsp</td></tr>\\n\";\n"
 
         "        html_preview += \"</table>\";\n"
@@ -725,6 +751,22 @@ static void webu_html_script_timer_pic(struct webui_ctx *webui)
 
 }
 
+/* Create the pictimer_function javascript function */
+static void webu_html_script_ptz(struct webui_ctx *webui)
+{
+    webui->resp_page +=
+        "    function action_ptz(actval) {\n\n"
+        "      var formData = new FormData();\n"
+        "      var camid = pData['cameras'][gIndexCam]['id'];\n\n"
+        "      formData.append('command', actval);\n"
+        "      formData.append('camid', camid);\n\n"
+        "      var request = new XMLHttpRequest();\n"
+        "      request.open('POST', '" + webui->hostfull + "');\n"
+        "      request.send(formData);\n\n"
+        "      return;\n"
+        "    }\n\n";
+}
+
 /* Call all the functions to create the java scripts of page*/
 static void webu_html_script(struct webui_ctx *webui)
 {
@@ -747,6 +789,7 @@ static void webu_html_script(struct webui_ctx *webui)
     webu_html_script_camera_click(webui);
     webu_html_script_timer_function(webui);
     webu_html_script_timer_pic(webui);
+    webu_html_script_ptz(webui);
 
     webui->resp_page += "  </script>\n\n";
 
diff --git a/src/webu_post.cpp b/src/webu_post.cpp
index e018e67f..5b4a4630 100644
--- a/src/webu_post.cpp
+++ b/src/webu_post.cpp
@@ -96,7 +96,7 @@ static void webu_post_cam_delete(struct webui_ctx *webui)
 }
 
 /* Get the command and thread number from the post data */
-void webu_post_cmdthr(struct webui_ctx *webui)
+void webu_post_cmdthrd(struct webui_ctx *webui)
 {
     int indx, camid;
 
@@ -349,13 +349,46 @@ static void webu_post_config(struct webui_ctx *webui)
 
 
 
+}
+
+/* Process the ptz action */
+void webu_post_ptz(struct webui_ctx *webui)
+{
+    struct ctx_cam *cam;
+
+    cam = webui->motapp->cam_list[webui->threadnbr];
+
+    if ((webui->post_cmd == "pan_left") && (cam->conf->ptz_pan_left != "")) {
+        util_exec_command(cam, cam->conf->ptz_pan_left.c_str(), NULL, 0);
+
+    } else if ((webui->post_cmd == "pan_right") && (cam->conf->ptz_pan_right != "")) {
+        util_exec_command(cam, cam->conf->ptz_pan_right.c_str(), NULL, 0);
+
+    } else if ((webui->post_cmd == "tilt_up") && (cam->conf->ptz_tilt_up != "")) {
+        util_exec_command(cam, cam->conf->ptz_tilt_up.c_str(), NULL, 0);
+
+    } else if ((webui->post_cmd == "tilt_down") && (cam->conf->ptz_tilt_down != "")) {
+        util_exec_command(cam, cam->conf->ptz_tilt_down.c_str(), NULL, 0);
+
+    } else if ((webui->post_cmd == "zoom_in") && (cam->conf->ptz_zoom_in != "")) {
+        util_exec_command(cam, cam->conf->ptz_zoom_in.c_str(), NULL, 0);
+
+    } else if ((webui->post_cmd == "zoom_out") && (cam->conf->ptz_zoom_out != "")) {
+        util_exec_command(cam, cam->conf->ptz_zoom_out.c_str(), NULL, 0);
+
+    } else {
+        return;
+    }
+
+    cam->frame_skip = cam->conf->ptz_wait;
+
 }
 
 /* Process the actions from the webcontrol that the user requested */
 void webu_post_main(struct webui_ctx *webui)
 {
 
-    webu_post_cmdthr(webui);
+    webu_post_cmdthrd(webui);
 
     if ((webui->post_cmd == "") || (webui->threadnbr == -1)) {
         return;
@@ -394,6 +427,15 @@ void webu_post_main(struct webui_ctx *webui)
     } else if (webui->post_cmd == "config") {
         webu_post_config(webui);
 
+    } else if (
+        (webui->post_cmd == "pan_left") ||
+        (webui->post_cmd == "pan_right") ||
+        (webui->post_cmd == "tilt_up") ||
+        (webui->post_cmd == "tilt_down") ||
+        (webui->post_cmd == "zoom_in") ||
+        (webui->post_cmd == "zoom_out")) {
+        webu_post_ptz(webui);
+
     } else {
         MOTION_LOG(INF, TYPE_STREAM, NO_ERRNO
             , _("Invalid action requested: command: >%s< threadnbr : >%d< ")