diff --git a/.gitignore b/.gitignore
index 1c7316f58e5492487998c725c3f3de51f5c42ec8..dea77e5f7aa2edc180c8177e5d7e555a239c6467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ workspace/
 states/
 .DS_Store
 screenshots/
+ajcore.*.txt
diff --git a/org.lamport.tla.toolbox.uitest/pom.xml b/org.lamport.tla.toolbox.uitest/pom.xml
index aef27b1446ea0e16433ad875ab90f07b74a2128e..17fd3fd9b207705aa3571190e9308c501baa40d0 100644
--- a/org.lamport.tla.toolbox.uitest/pom.xml
+++ b/org.lamport.tla.toolbox.uitest/pom.xml
@@ -18,7 +18,7 @@
   		<dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.8.2</version>
+            <version>1.8.5</version>
         </dependency>
         <!-- Down below we manually install the standalone feature. Maven/Tycho isn't
         	 smart enough to figure this out by itself. Thus, we have to tell Tycho
diff --git a/tlatools/customBuild.xml b/tlatools/customBuild.xml
index 0e94e21ed368b3eab8e10ac9967b43903d80873c..4b995b7bdceb8b4f51d9faa041354923eb4d4257 100644
--- a/tlatools/customBuild.xml
+++ b/tlatools/customBuild.xml
@@ -24,7 +24,7 @@
 
 	<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
 		<classpath>
-			<pathelement location="lib/aspectjtools.jar" />
+			<pathelement location="lib/aspectjtools-1.8.5.jar" />
 		</classpath>
 	</taskdef>
 
@@ -89,8 +89,8 @@
 		<iajc destdir="${class.dir}" sourceRoots="${src-aj.dir}" debug="true" source="1.5" target="1.5">
 			<classpath refid="project.classpath" />
 			<classpath>
-				<pathelement location="lib/aspectjrt.jar" />
-				<pathelement location="lib/aspectjtools.jar" />
+				<pathelement location="lib/aspectjrt-1.8.5.jar" />
+				<pathelement location="lib/aspectjtools-1.8.5.jar" />
 				<pathelement path="${class.dir}" />
 			</classpath>
 		</iajc>
@@ -107,8 +107,8 @@
 		<!-- These files are requried for load time weaving and during runtime -->
 		<copy todir="${class.dir}/lib">
 			<fileset dir="lib/">
-				<include name="aspectjrt.jar" />
-				<include name="aspectjweaver.jar" />
+				<include name="aspectjrt-1.8.5.jar" />
+				<include name="aspectjweaver-1.8.5.jar" />
 			</fileset>
 		</copy>
 	</target>
diff --git a/tlatools/lib/aspectjrt.jar b/tlatools/lib/aspectjrt-1.8.5.jar
similarity index 52%
rename from tlatools/lib/aspectjrt.jar
rename to tlatools/lib/aspectjrt-1.8.5.jar
index 94f9410effc8f2ee025969d0ae525b9713b9677c..b8241c820410996cc4a13dc942c27c6b0d9d6050 100644
Binary files a/tlatools/lib/aspectjrt.jar and b/tlatools/lib/aspectjrt-1.8.5.jar differ
diff --git a/tlatools/lib/aspectjtools.jar b/tlatools/lib/aspectjtools-1.8.5.jar
similarity index 50%
rename from tlatools/lib/aspectjtools.jar
rename to tlatools/lib/aspectjtools-1.8.5.jar
index 544553980a92f17a4bb9a56ddc9cfe1c6fccec0c..31f045d54150a074202fafac517f9be9243d0519 100644
Binary files a/tlatools/lib/aspectjtools.jar and b/tlatools/lib/aspectjtools-1.8.5.jar differ
diff --git a/tlatools/lib/aspectjweaver-1.8.5.jar b/tlatools/lib/aspectjweaver-1.8.5.jar
new file mode 100644
index 0000000000000000000000000000000000000000..952a8e4c7cae616b1d20da5dde99a820911df527
Binary files /dev/null and b/tlatools/lib/aspectjweaver-1.8.5.jar differ
diff --git a/tlatools/lib/aspectjweaver.jar b/tlatools/lib/aspectjweaver.jar
deleted file mode 100644
index bfd54339ca8525f9a7acbadd1e48d2ff6353d81e..0000000000000000000000000000000000000000
Binary files a/tlatools/lib/aspectjweaver.jar and /dev/null differ