diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 5bac8476524c..e20e5649f046 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -202,6 +202,7 @@ powerpc/powerpc/pic_if.m	standard
 powerpc/powerpc/pmap_dispatch.c	standard
 powerpc/powerpc/platform.c	standard
 powerpc/powerpc/platform_if.m	standard
+powerpc/powerpc/ptrace_machdep.c	standard
 powerpc/powerpc/sc_machdep.c	optional	sc
 powerpc/powerpc/setjmp.S	standard
 powerpc/powerpc/sigcode32.S	optional	powerpc | compat_freebsd32
diff --git a/sys/powerpc/include/ptrace.h b/sys/powerpc/include/ptrace.h
index eef24f829b48..c622dedd8938 100644
--- a/sys/powerpc/include/ptrace.h
+++ b/sys/powerpc/include/ptrace.h
@@ -1,6 +1,6 @@
 /*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 2014 Justin Hibbits
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,4 +33,9 @@
 #ifndef _MACHINE_PTRACE_H_
 #define _MACHINE_PTRACE_H_
 
+#define	__HAVE_PTRACE_MACHDEP
+
+#define PT_GETVRREGS	(PT_FIRSTMACH + 0)
+#define PT_SETVRREGS	(PT_FIRSTMACH + 1)
+
 #endif
diff --git a/sys/powerpc/include/reg.h b/sys/powerpc/include/reg.h
index 3d2d5819091f..3059c517df31 100644
--- a/sys/powerpc/include/reg.h
+++ b/sys/powerpc/include/reg.h
@@ -24,6 +24,14 @@ struct fpreg {
 	double fpscr;
 };
 
+/* Must match pcb.pcb_vec */
+struct vmxreg {
+	uint32_t vr[32][4];
+	uint32_t pad[2];
+	uint32_t vrsave;
+	uint32_t vscr;
+};
+
 struct dbreg {
 	unsigned int	junk;
 };
@@ -43,6 +51,10 @@ struct fpreg32 {
 	struct fpreg data;
 };
 
+struct vmxreg32 {
+	struct vmxreg data;
+};
+
 struct dbreg32 {
 	struct dbreg data;
 };
diff --git a/sys/powerpc/powerpc/ptrace_machdep.c b/sys/powerpc/powerpc/ptrace_machdep.c
new file mode 100644
index 000000000000..fed000feb415
--- /dev/null
+++ b/sys/powerpc/powerpc/ptrace_machdep.c
@@ -0,0 +1,82 @@
+/*-
+ * Copyright (c) 2014 Justin Hibbits
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_compat.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
+#include <sys/ptrace.h>
+#include <sys/sysent.h>
+#include <machine/altivec.h>
+#include <machine/cpu.h>
+#include <machine/md_var.h>
+#include <machine/pcb.h>
+
+int
+cpu_ptrace(struct thread *td, int req, void *addr, int data)
+{
+	int error;
+	struct pcb *pcb;
+	struct vec vec;
+
+	pcb = td->td_pcb;
+
+	bzero(&vec, sizeof(vec));
+
+	error = EINVAL;
+	switch (req) {
+	case PT_GETVRREGS:
+		if (!(cpu_features & PPC_FEATURE_HAS_ALTIVEC))
+			break;
+
+		if (pcb->pcb_flags & PCB_VEC) {
+			save_vec_nodrop(td);
+			memcpy(&vec, &pcb->pcb_vec, sizeof(vec));
+		}
+		error = copyout(&vec, addr, sizeof(vec));
+		break;
+	case PT_SETVRREGS:
+		if (!(cpu_features & PPC_FEATURE_HAS_ALTIVEC))
+			break;
+		error = copyin(addr, &vec, sizeof(vec));
+		if (error == 0) {
+			pcb->pcb_flags |= PCB_VEC;
+			memcpy(&pcb->pcb_vec, &vec, sizeof(vec));
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	return (error);
+}