diff --git a/plugins/psgi/psgi_plugin.c b/plugins/psgi/psgi_plugin.c
index 7b39bf7c..a6da23ac 100644
--- a/plugins/psgi/psgi_plugin.c
+++ b/plugins/psgi/psgi_plugin.c
@@ -663,7 +663,24 @@ void uwsgi_perl_after_request(struct wsgi_request *wsgi_req) {
 
 	// async plagued could be defined in other areas...
 	if (wsgi_req->async_plagued) {
+		int i;
+
 		uwsgi_log("*** psgix.harakiri.commit requested ***\n");
+
+		// clear the env, make sure any DESTROY attached to it will
+		// run.
+		SvREFCNT_dec(wsgi_req->async_environ);
+
+		// We must free our perl context(s) so any DESTROY hooks
+		// etc. will run.
+		for(i=0;i<uwsgi.threads;i++) {
+			perl_destruct(uperl.main[i]);
+			perl_free(uperl.main[i]);
+		}
+		free(uperl.main);
+
+		// This will call simple_goodbye_cruel_world() which'll
+		// exit(0). So we won't run anything below.
 		goodbye_cruel_world();
 	}
 
diff --git a/t/perl/test_harakiri.psgi b/t/perl/test_harakiri.psgi
new file mode 100644
index 00000000..7680944a
--- /dev/null
+++ b/t/perl/test_harakiri.psgi
@@ -0,0 +1,19 @@
+use strict;
+use warnings;
+
+{
+    package psgix::harakiri::tester;
+    sub DESTROY { print STDERR "$$: Calling DESTROY\n" }
+}
+
+sub {
+    my $env = shift;
+
+    die "PANIC: We should support psgix.harakiri here" unless $env->{'psgix.harakiri'};
+
+    $env->{'psgix.harakiri.tester'} = bless {} => 'psgix::harakiri::tester';
+    my $harakiri = $env->{QUERY_STRING};
+    $env->{'psgix.harakiri.commit'} = $harakiri ? 1 : 0;
+
+    return [200, [], [ $harakiri ? "We are about to destroy ourselves\n" : "We will live for another request\n" ]];
+}