diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 50fd5aba87b..0c2e1c8dcea 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1531,10 +1531,10 @@ static RenderPart *find_next_pano_slice(Render *re, int *minx, rctf *viewplane)
 			
 	if(best) {
 		float phi= panorama_pixel_rot(re);
-
+		/* R.disprect.xmax - R.disprect.xmin rather then R.winx for border render */
 		R.panodxp= (re->winx - (best->disprect.xmin + best->disprect.xmax) )/2;
-		R.panodxv= ((viewplane->xmax-viewplane->xmin)*R.panodxp)/(float)R.winx;
-		
+		R.panodxv= ((viewplane->xmax-viewplane->xmin)*R.panodxp)/(float)(R.disprect.xmax - R.disprect.xmin);
+
 		/* shift viewplane */
 		R.viewplane.xmin = viewplane->xmin + R.panodxv;
 		R.viewplane.xmax = viewplane->xmax + R.panodxv;
@@ -2663,10 +2663,6 @@ int RE_is_rendering_allowed(Scene *scene, void *erh, void (*error)(void *handle,
 	
 	/* forbidden combinations */
 	if(scene->r.mode & R_PANORAMA) {
-		if(scene->r.mode & R_BORDER) {
-			error(erh, "No border supported for Panorama");
-			return 0;
-		}
 		if(scene->r.mode & R_ORTHO) {
 			error(erh, "No Ortho render possible for Panorama");
 			return 0;
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index bd4af52cd91..3ddfabfa110 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -96,8 +96,15 @@ void calc_view_vector(float *view, float x, float y)
 	}
 	else {
 		
-		if(R.r.mode & R_PANORAMA)
-			x-= R.panodxp;
+		if(R.r.mode & R_PANORAMA) {
+			if(R.r.mode & R_BORDER) {
+				/* scale by the win/border size */
+				x-= R.panodxp * ((float)R.winx / (float)(R.disprect.xmax - R.disprect.xmin));
+			}
+			else {
+				x-= R.panodxp;
+			}
+		}
 		
 		/* move x and y to real viewplane coords */
 		x= (x/(float)R.winx);