diff --git a/openjdk-latest.spec b/openjdk-latest.spec
index bad206add3dfcced0194dfeafc2dbc9179f36b4c..0dae7037ac399a7868c6a8a62281b702651f511e 100644
--- a/openjdk-latest.spec
+++ b/openjdk-latest.spec
@@ -1317,6 +1317,9 @@ bash ../configure \
 %endif
 %ifarch %{ppc64le}
     --with-jobs=1 \
+%endif
+%if "%toolchain" == "clang"
+    --with-toolchain-type=clang \
 %endif
     --with-version-build=%{buildver} \
     --with-version-pre=\"${EA_DESIGNATOR}\" \
diff --git a/tags b/tags
new file mode 100644
index 0000000000000000000000000000000000000000..dea5b87bf0709e9dc8619dfe5e75bf19c5cfba6a
--- /dev/null
+++ b/tags
@@ -0,0 +1,12 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
+!_TAG_PROGRAM_NAME	Exuberant Ctags	//
+!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
+!_TAG_PROGRAM_VERSION	5.8	//
+TestCryptoLevel	TestCryptoLevel.java	/^public class TestCryptoLevel$/;"	kind:c	line:25
+TestCryptoLevel.main	TestCryptoLevel.java	/^  public static void main(String[] args)$/;"	kind:m	line:27	class:TestCryptoLevel	access:public	signature:(String[] args)
+TestECDSA	TestECDSA.java	/^public class TestECDSA {$/;"	kind:c	line:26
+TestECDSA.main	TestECDSA.java	/^    public static void main(String[] args) throws Exception {$/;"	kind:m	line:28	class:TestECDSA	access:public	signature:(String[] args)
+main	TestCryptoLevel.java	/^  public static void main(String[] args)$/;"	kind:m	line:27	class:TestCryptoLevel	access:public	signature:(String[] args)
+main	TestECDSA.java	/^    public static void main(String[] args) throws Exception {$/;"	kind:m	line:28	class:TestECDSA	access:public	signature:(String[] args)