diff -rupN src1/gmxlib/nonbonded/nb_generic_adress.c src/gmxlib/nonbonded/nb_generic_adress.c
--- src1/gmxlib/nonbonded/nb_generic_adress.c	2013-11-08 12:09:33.000000000 +0100
+++ src/gmxlib/nonbonded/nb_generic_adress.c	2014-05-07 01:14:56.620005636 +0200
@@ -110,9 +110,7 @@ gmx_nb_generic_adress_kernel(t_nblist *
     int           egp_nr;
 
     wf                  = mdatoms->wf;
-
     force_cap           = fr->adress_ex_forcecap;
-
     x                   = xx[0];
     f                   = ff[0];
     ielec               = nlist->ielec;
@@ -279,6 +277,12 @@ gmx_nb_generic_adress_kernel(t_nblist *
             dy               = iy - jy;
             dz               = iz - jz;
             rsq              = dx*dx+dy*dy+dz*dz;
+            /* Softcore if atomistic and within the hybrid region. */
+            if (hybscal != 1.0 && !bCG && force_cap != 0)
+            {
+                if (rsq < force_cap)
+                    rsq = force_cap;
+            }
             rinv             = gmx_invsqrt(rsq);
             rinvsq           = rinv*rinv;
             felec            = 0;
@@ -479,12 +483,6 @@ gmx_nb_generic_adress_kernel(t_nblist *
             } /* end VdW interactions */
 
             fscal            = felec+fvdw;
-
-            if (!bCG && force_cap > 0 && (fabs(fscal) > force_cap))
-            {
-                fscal = force_cap*fscal/fabs(fscal);
-            }
-
             fscal           *= hybscal;
 
             tx               = fscal*dx;
diff -rupN /manel/gromacs-4.6.5/src/mdlib/forcerec.c src/mdlib/forcerec.c
--- /manel/gromacs-4.6.5/src/mdlib/forcerec.c	2013-11-13 17:09:07.000000000 +0100
+++ src/mdlib/forcerec.c	2014-01-13 17:53:43.259919269 +0100
@@ -2128,7 +2128,7 @@ void init_forcerec(FILE              *fp
         fr->adress_hy_width       = ir->adress->hy_width;
         fr->adress_icor           = ir->adress->icor;
         fr->adress_site           = ir->adress->site;
-        fr->adress_ex_forcecap    = ir->adress->ex_forcecap;
+        fr->adress_ex_forcecap    = ir->adress->ex_forcecap*ir->adress->ex_forcecap;
         fr->adress_do_hybridpairs = ir->adress->do_hybridpairs;