diff --git a/include/asterisk/features.h b/include/asterisk/features.h
index ac745101d7eb52a19f407186fe3a7f9b60bddcf6..723373f94b2fe584b64017cd493c4d2ec2113723 100644
--- a/include/asterisk/features.h
+++ b/include/asterisk/features.h
@@ -33,6 +33,8 @@
 #define FEATURE_EXTEN_LEN	32
 #define FEATURE_MOH_LEN		80  /* same as MAX_MUSICCLASS from channel.h */
 
+#define PARK_APP_NAME "Park"
+
 /*! \brief main call feature structure */
 
 enum {
diff --git a/main/features.c b/main/features.c
index 87d13052879f6ecb53d8013f622b0ae0ef282d5c..41fc088e9335d7b29df66ad291d45136287297a1 100644
--- a/main/features.c
+++ b/main/features.c
@@ -159,7 +159,7 @@ static char *descrip = "ParkedCall(exten): "
 "context.  If no extension is provided, then the first available\n"
 "parked call will be acquired.\n";
 
-static char *parkcall = "Park";
+static char *parkcall = PARK_APP_NAME;
 
 static char *synopsis2 = "Park yourself";
 
diff --git a/res/res_agi.c b/res/res_agi.c
index d5cd0961f4ed761a66483fb2319aa389d75458b3..d4cbd6f16c54a2d0c4bdc9ce484797f7466727f0 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -56,6 +56,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/ast_version.h"
 #include "asterisk/speech.h"
 #include "asterisk/manager.h"
+#include "asterisk/features.h"
 
 #define MAX_ARGS 128
 #define AGI_NANDFS_RETRY 3
@@ -1457,6 +1458,9 @@ static int handle_exec(struct ast_channel *chan, AGI *agi, int argc, char **argv
 	ast_verb(3, "AGI Script Executing Application: (%s) Options: (%s)\n", argv[1], argv[2]);
 
 	if ((app_to_exec = pbx_findapp(argv[1]))) {
+		if(!strcasecmp(argv[1], PARK_APP_NAME)) {
+			ast_masq_park_call(chan, NULL, 0, NULL);
+		}
 		if (ast_compat_res_agi && !ast_strlen_zero(argv[2])) {
 			char *compat = alloca(strlen(argv[2]) * 2 + 1), *cptr, *vptr;
 			for (cptr = compat, vptr = argv[2]; *vptr; vptr++) {