diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index 0a5e8c3dd98..0328e6cbf58 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -2875,7 +2875,7 @@ static void rotate_particle(ParticleSettings *part, ParticleData *pa, float dfra
 	float rotfac, rot1[4], rot2[4]={1.0,0.0,0.0,0.0}, dtime=dfra*timestep;
 
 	if((part->flag & PART_ROT_DYN)==0){
-		if(ELEM(part->avemode,PART_AVE_SPIN,PART_AVE_VEL)){
+		if(part->avemode==PART_AVE_SPIN){
 			float angle;
 			float len1 = VecLength(pa->state.vel);
 			float len2 = VecLength(state->vel);
@@ -2888,10 +2888,9 @@ static void rotate_particle(ParticleSettings *part, ParticleData *pa, float dfra
 				angle=Inpf(pa->state.vel,state->vel)/(len1*len2);
 				VecMulf(state->ave,saacos(angle)/dtime);
 			}
-		}
 
-		if(part->avemode == PART_AVE_SPIN)
 			VecRotToQuat(state->vel,dtime*part->avefac,rot2);
+		}
 	}
 
 	rotfac=VecLength(state->ave);
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 6fcedcd934a..acd663466d5 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -365,7 +365,6 @@ typedef struct ParticleSystem{
 /* part->avemode */
 #define PART_AVE_SPIN		1
 #define PART_AVE_RAND		2
-#define PART_AVE_VEL		3
 
 /* part->reactevent */
 #define PART_EVENT_DEATH	0
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 66b7ea62b12..e00e38477a8 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -4513,7 +4513,7 @@ static void object_panel_particle_physics(Object *ob)
 		uiDefButF(block, NUM, B_PART_RECALC, "Rand:",			butx+butw/2,buty,butw/2,buth*4/5, &part->randphasefac, 0.0, 1.0, 1, 3, "Randomize rotation phase");
 		uiBlockSetCol(block, TH_AUTO);
 
-		uiDefButS(block, MENU, B_PART_RECALC, "Angular v %t|Velocity%x3|Random%x2|Spin%x1|None%x0", butx,(buty-=buth*4/5),butw,buth*4/5, &part->avemode, 14.0, 0.0, 0, 0, "Select particle angular velocity mode");
+		uiDefButS(block, MENU, B_PART_RECALC, "Angular v %t|Random%x2|Spin%x1|None%x0", butx,(buty-=buth*4/5),butw,buth*4/5, &part->avemode, 14.0, 0.0, 0, 0, "Select particle angular velocity mode");
 		uiBlockSetCol(block, TH_BUT_SETTING2);
 		if(ELEM(part->avemode,PART_AVE_RAND,PART_AVE_SPIN))
 			uiDefButF(block, NUM, B_PART_RECALC, "Angular v:",		butx,(buty-=buth*4/5),butw,buth*4/5, &part->avefac, -200.0, 200.0, 1, 3, "Angular velocity amount");